diff --git a/BeWo/View/Controls/AI/AiChatButton.xaml b/BeWo/View/Controls/AI/AiChatButton.xaml
index 8c9696793..66c94d2bf 100644
--- a/BeWo/View/Controls/AI/AiChatButton.xaml
+++ b/BeWo/View/Controls/AI/AiChatButton.xaml
@@ -96,6 +96,14 @@
          StaysOpen="False">
          <Border x:Name="border_promptbaustein_al" BorderThickness="1" />
      </Popup>-->
+        <Border
+            x:Name="borderLoadingOverlay"
+            Grid.Column="0"
+            Grid.ColumnSpan="4"
+            Background="Transparent"
+            ToolTip="Lade"
+            ToolTipService.ShowOnDisabled="True"
+            Visibility="{Binding IsLoading, Converter={StaticResource BoolVisibilityConverter}}" />
         <Popup
             x:Name="popup_promptbaustein_favoriten"
             Width="400"
diff --git a/BeWo/ViewModel/Controls/AI/AiChatButtonViewModel.cs b/BeWo/ViewModel/Controls/AI/AiChatButtonViewModel.cs
index c66b0a916..c0033f7f7 100644
--- a/BeWo/ViewModel/Controls/AI/AiChatButtonViewModel.cs
+++ b/BeWo/ViewModel/Controls/AI/AiChatButtonViewModel.cs
@@ -57,6 +57,7 @@ namespace BeWo.ViewModel.Controls.AI
 					return;
 
 				FirePropertyChanged(nameof(IsContextSizeTooBig));
+				FirePropertyChanged(nameof(IsLoading));
 				FirePropertyChanged(nameof(CanSendNewMessage));
 				FirePropertyChanged(nameof(CanOpenConversation));
 
@@ -73,6 +74,7 @@ namespace BeWo.ViewModel.Controls.AI
 		public DelegateCommand OpenFavoritePromptsPopupCommand { get; protected set; }
 
 		public bool IsContextSizeTooBig => ButtonState == AiChatButtonState.Warning;
+		public bool IsLoading => ButtonState == AiChatButtonState.Loading;
 		public virtual bool CanSendNewMessage => ButtonState == AiChatButtonState.Normal;
 		public bool CanOpenConversation => ButtonState == AiChatButtonState.Normal || ButtonState == AiChatButtonState.Warning;
 
@@ -119,7 +121,8 @@ namespace BeWo.ViewModel.Controls.AI
 						else
 							ButtonState = AiChatButtonState.Warning;
 					},
-					(exp) => ButtonState = AiChatButtonState.Disabled);
+					(exp) => ButtonState = AiChatButtonState.Disabled,
+					false);
 			}
 		}