diff --git a/BeWo/Styles/ControlStyles/ButtonStyles.xaml b/BeWo/Styles/ControlStyles/ButtonStyles.xaml
index acd87e235..8cb76f064 100644
--- a/BeWo/Styles/ControlStyles/ButtonStyles.xaml
+++ b/BeWo/Styles/ControlStyles/ButtonStyles.xaml
@@ -441,4 +441,52 @@
             </Setter.Value>
         </Setter>
     </Style>
+
+    <Style
+        x:Key="ButtonPreviousStyle2"
+        BasedOn="{StaticResource PrimaryButton}"
+        TargetType="{x:Type Button}">
+        <Setter Property="Width" Value="25" />
+        <Setter Property="Height" Value="25" />
+        <Setter Property="Margin" Value="3" />
+        <Setter Property="Content">
+            <Setter.Value>
+                <Image
+                    Width="20"
+                    Height="18"
+                    Margin="0,3,0,0"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    Source="..\..\Ressources\Icons\Undo.png" />
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style
+        x:Key="ButtonRedoStyle2"
+        BasedOn="{StaticResource PrimaryButton}"
+        TargetType="{x:Type Button}">
+        <Setter Property="Width" Value="25" />
+        <Setter Property="Height" Value="25" />
+        <Setter Property="Margin" Value="3" />
+        <Setter Property="Content">
+            <Setter.Value>
+                <Image
+                    Width="20"
+                    Height="18"
+                    Margin="0,3,0,0"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    Source="..\..\Ressources\Icons\Undo.png" />
+            </Setter.Value>
+        </Setter>
+        <Setter Property="RenderTransform">
+            <Setter.Value>
+                <TransformGroup>
+                    <ScaleTransform ScaleX="-1" />
+                    <TranslateTransform X="25" />
+                </TransformGroup>
+            </Setter.Value>
+        </Setter>
+    </Style>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/BeWo/Styles/Features/AIChatStyles.xaml b/BeWo/Styles/Features/AIChatStyles.xaml
index 8e400cc29..bfa025d2d 100644
--- a/BeWo/Styles/Features/AIChatStyles.xaml
+++ b/BeWo/Styles/Features/AIChatStyles.xaml
@@ -148,7 +148,21 @@
 
     <!--  Assistent Message Control  -->
     <DataTemplate x:Key="AssistentMessageTemplate">
-        <Grid Margin="0,0,60,0" HorizontalAlignment="Left">
+        <Grid
+            Margin="0,0,60,0"
+            HorizontalAlignment="Left"
+            Tag="{Binding DataContext, RelativeSource={RelativeSource AncestorType=ItemsControl}}">
+            <Grid.ContextMenu>
+                <ContextMenu ItemsSource="{Binding PlacementTarget.Tag.AssistentCommands, RelativeSource={RelativeSource Self}}">
+                    <ContextMenu.ItemContainerStyle>
+                        <Style TargetType="MenuItem">
+                            <Setter Property="Header" Value="{Binding Name}" />
+                            <Setter Property="Command" Value="{Binding Command}" />
+                            <Setter Property="CommandParameter" Value="{Binding Path=PlacementTarget.DataContext, RelativeSource={RelativeSource AncestorType=ContextMenu}}" />
+                        </Style>
+                    </ContextMenu.ItemContainerStyle>
+                </ContextMenu>
+            </Grid.ContextMenu>
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="auto" />
                 <ColumnDefinition Width="*" />
diff --git a/BeWo/View/Controls/AI/AiChatButton.xaml b/BeWo/View/Controls/AI/AiChatButton.xaml
index 78a94ff88..2e0ceb0a9 100644
--- a/BeWo/View/Controls/AI/AiChatButton.xaml
+++ b/BeWo/View/Controls/AI/AiChatButton.xaml
@@ -74,19 +74,19 @@
             x:Name="stackpanelUndoRedo"
             Grid.Column="6"
             Orientation="Horizontal"
-            Visibility="{Binding IsHistoryEnabled, Converter={StaticResource BoolVisibilityConverter}}">
+            Visibility="{Binding IsHistoryVisible, Converter={StaticResource BoolVisibilityConverter}}">
             <Button
                 x:Name="btn_AiPromptbausteinUndo"
                 Margin="0"
                 Command="{Binding UndoAiActionCommand}"
-                Style="{StaticResource ButtonPreviousStyle}"
-                Visibility="{Binding IsUndoButtonVisible, Converter={StaticResource BoolVisibilityHiddenConverter}}" />
+                IsEnabled="{Binding IsUndoButtonVisible}"
+                Style="{StaticResource ButtonPreviousStyle2}" />
             <Button
                 x:Name="btn_AiPromptbausteinRedo"
                 Margin="3,0,0,0"
                 Command="{Binding RedoAiActionCommand}"
-                Style="{StaticResource ButtonRedoStyle}"
-                Visibility="{Binding IsRedoButtonVisible, Converter={StaticResource BoolVisibilityHiddenConverter}}" />
+                IsEnabled="{Binding IsRedoButtonVisible}"
+                Style="{StaticResource ButtonRedoStyle2}" />
         </StackPanel>
         <!--<Popup
          x:Name="popup_promptbaustein_all"
diff --git a/BeWo/View/Detail/AI/AiConversationChatView.xaml b/BeWo/View/Detail/AI/AiConversationChatView.xaml
index 2bfd55d6f..a516d3b58 100644
--- a/BeWo/View/Detail/AI/AiConversationChatView.xaml
+++ b/BeWo/View/Detail/AI/AiConversationChatView.xaml
@@ -284,6 +284,7 @@
                             ItemsSource="{Binding ListVM.SelectedVM.Messages.VMList, UpdateSourceTrigger=PropertyChanged}"
                             ScrollViewer.CanContentScroll="False"
                             ScrollViewer.HorizontalScrollBarVisibility="Disabled"
+                            Tag="{Binding DataContext, ElementName=root}"
                             Visibility="{Binding IsNewConversationVisible, Converter={StaticResource BoolVisibilityConverter}, ConverterParameter=Reverse}">
                             <ListView.ItemContainerStyle>
                                 <Style TargetType="ListViewItem">
diff --git a/BeWo/ViewModel/Controls/AI/AiChatButtonViewModel.cs b/BeWo/ViewModel/Controls/AI/AiChatButtonViewModel.cs
index b74e6c657..04d90fdb6 100644
--- a/BeWo/ViewModel/Controls/AI/AiChatButtonViewModel.cs
+++ b/BeWo/ViewModel/Controls/AI/AiChatButtonViewModel.cs
@@ -33,6 +33,7 @@ namespace BeWo.ViewModel.Controls.AI
 		public List<AiMenuItemTemplate> AssistentCommands { get; protected set; }
 
 		public virtual bool IsHistoryEnabled => false;
+		public virtual bool IsHistoryVisible => false;
 
 		public bool IsEnabled => BeWoApp.AppSettings.ShowAI && BeWoApp.HasLoggedOnUserRight(GetUserRightType());
 
@@ -162,7 +163,7 @@ namespace BeWo.ViewModel.Controls.AI
 		{
 			var context = GetAiVisualContext();
 
-			var chat_viewmodel = VMFactory.CreateAiConversationChatViewModel(ActionType, context, CanSendNewMessage);
+			var chat_viewmodel = VMFactory.CreateAiConversationChatViewModel(ActionType, context, AssistentCommands, CanSendNewMessage);
 
 			return chat_viewmodel;
 		}
diff --git a/BeWo/ViewModel/Controls/AI/AiChatButtonWithHistoryViewModel.cs b/BeWo/ViewModel/Controls/AI/AiChatButtonWithHistoryViewModel.cs
index df9f859c1..15440a013 100644
--- a/BeWo/ViewModel/Controls/AI/AiChatButtonWithHistoryViewModel.cs
+++ b/BeWo/ViewModel/Controls/AI/AiChatButtonWithHistoryViewModel.cs
@@ -14,8 +14,8 @@ namespace BeWo.ViewModel.Controls.AI
 	{
 		private readonly ITextProvider _provider;
 		private readonly string _key;
+		private int _currentIndex;
 
-		public int CurrentIndex { get; set; }
 		public List<string> History { get; set; }
 
 		public string CurrentValue
@@ -24,7 +24,20 @@ namespace BeWo.ViewModel.Controls.AI
 			set => _provider.SetText(_key, value);
 		}
 
+		public int CurrentIndex
+		{
+			get => _currentIndex;
+			set { 
+				if(SetProperty(ref _currentIndex, value, nameof(CurrentIndex)))
+				{
+					FirePropertyChanged(nameof(IsUndoButtonVisible));
+					FirePropertyChanged(nameof(IsRedoButtonVisible));
+				}
+			}
+		}
+
 		public override bool IsHistoryEnabled => true;
+		public override bool IsHistoryVisible => History.Count > 1;
 
 		public bool IsUndoButtonVisible => CurrentIndex > 0;
 		public bool IsRedoButtonVisible => CurrentIndex < History.Count - 1;
@@ -51,8 +64,8 @@ namespace BeWo.ViewModel.Controls.AI
 					Name = "Ersetzen"
 				},
 			};
-			UndoAiActionCommand= new DelegateCommand(UndoAiAction);
-			RedoAiActionCommand= new DelegateCommand(RedoAiAction);
+			UndoAiActionCommand = new DelegateCommand(UndoAiAction);
+			RedoAiActionCommand = new DelegateCommand(RedoAiAction);
 
 			_provider = provider;
 			_key = key;
@@ -66,8 +79,7 @@ namespace BeWo.ViewModel.Controls.AI
 			History.Add(CurrentValue);
 			CurrentIndex = 0;
 
-			FirePropertyChanged(nameof(IsRedoButtonVisible));
-			FirePropertyChanged(nameof(IsUndoButtonVisible));
+			FirePropertyChanged(nameof(IsHistoryVisible));
 		}
 
 		public void UndoAiAction()
@@ -120,7 +132,11 @@ namespace BeWo.ViewModel.Controls.AI
 				History.RemoveRange(idx + 1, last_idx - idx);
 			}
 
-			if (CurrentValue != History[CurrentIndex])
+			if (History.Count == 0)
+			{
+				History.Add(CurrentValue);
+			}
+			else if (CurrentValue != History[CurrentIndex])
 			{
 				History.Add(CurrentValue);
 				CurrentIndex++;
@@ -130,6 +146,8 @@ namespace BeWo.ViewModel.Controls.AI
 			CurrentIndex++;
 
 			CurrentValue = str;
+
+			FirePropertyChanged(nameof(IsHistoryVisible));
 		}
 	}
 }
diff --git a/BeWo/ViewModel/ListViewModel/ServiceRecordListVM.cs b/BeWo/ViewModel/ListViewModel/ServiceRecordListVM.cs
index 5cef86917..d50f72f3f 100644
--- a/BeWo/ViewModel/ListViewModel/ServiceRecordListVM.cs
+++ b/BeWo/ViewModel/ListViewModel/ServiceRecordListVM.cs
@@ -2028,8 +2028,10 @@ namespace BeWo.ViewModel.ListViewModel
 			{
 				return AktuellerEditDokutext;
 			}
-
-			throw new BeWoNotImplementedException($"key '{key}' unbekannt");
+			else
+			{
+				throw new BeWoNotImplementedException($"key '{key}' unbekannt");
+			}
 		}
 
 		public void SetText(string key, string value)
@@ -2042,8 +2044,10 @@ namespace BeWo.ViewModel.ListViewModel
 			{
 				AktuellerEditDokutext = value;
 			}
-
-			throw new BeWoNotImplementedException($"key '{key}' unbekannt");
+			else
+			{
+				throw new BeWoNotImplementedException($"key '{key}' unbekannt");
+			}
 		}
 	}
 }
\ No newline at end of file
diff --git a/BeWo/ViewModel/VMFactory.cs b/BeWo/ViewModel/VMFactory.cs
index 181c2f851..8440ad282 100644
--- a/BeWo/ViewModel/VMFactory.cs
+++ b/BeWo/ViewModel/VMFactory.cs
@@ -5,6 +5,7 @@ using System.Windows.Threading;
 using BeWo.Core.Service;
 using BeWo.SchulbegleitenderDienst.ViewModel;
 using BeWo.ServiceProxy;
+using BeWo.ViewModel.Controls.AI;
 using BeWo.ViewModel.ListViewModel;
 using BeWo.ViewModel.View.AI;
 using BS.Shared;
@@ -912,7 +913,7 @@ namespace BeWo.ViewModel
 			einheit_vm_list.VMList.Sort(WohneinheitVM.Compare);
 		}
 
-		public static AiConversationChatViewModel CreateAiConversationChatViewModel(AiActionType actionType, AiViewContextDC view_context, bool canSendNewMessage = true)
+		public static AiConversationChatViewModel CreateAiConversationChatViewModel(AiActionType actionType, AiViewContextDC view_context, List<AiMenuItemTemplate> assistentCommands = null, bool canSendNewMessage = true)
 		{
 			var vm = new AiConversationChatViewModel();
 
@@ -920,6 +921,14 @@ namespace BeWo.ViewModel
 			vm.ViewContext = view_context;
 			vm.CanSendNewMessage = canSendNewMessage;
 
+			if (assistentCommands is object)
+			{
+				foreach (var command in assistentCommands)
+				{
+					vm.ImportAssistentCommand(command);
+				}
+			}
+
 			return vm;
 		}
 
@@ -995,7 +1004,7 @@ namespace BeWo.ViewModel
 
 				foreach (var routine in folder.SubRoutines.VMList)
 				{
-					if(routine.IsFavorite)
+					if (routine.IsFavorite)
 						favoriten.SubRoutines.VMList.Add(routine);
 				}
 			}
diff --git a/BeWo/ViewModel/View/AI/AiConversationChatViewModel.cs b/BeWo/ViewModel/View/AI/AiConversationChatViewModel.cs
index 1903e6688..23e4555c0 100644
--- a/BeWo/ViewModel/View/AI/AiConversationChatViewModel.cs
+++ b/BeWo/ViewModel/View/AI/AiConversationChatViewModel.cs
@@ -17,6 +17,7 @@ using System.Diagnostics;
 using DevExpress.XtraCharts.Native;
 using static DevExpress.Utils.Drawing.Helpers.NativeMethods;
 using System.Security.Cryptography;
+using BeWo.ViewModel.Controls.AI;
 
 namespace BeWo.ViewModel.View.AI
 {
@@ -58,6 +59,8 @@ namespace BeWo.ViewModel.View.AI
 
 			ListVM = new AiConversationListVM();
 			ListVM.SelectedVMChanged += (s, e) => FirePropertyChanged(nameof(IsNewConversationVisible));
+
+			AssistentCommands = new List<AiMenuItemTemplate>();
 		}
 
 		public event EventHandler SendNewMessageSuccess;
@@ -81,6 +84,9 @@ namespace BeWo.ViewModel.View.AI
 		public ICommand AcceptSavePromptCommand { get; set; }
 		public ICommand CancelSavePromptCommand { get; set; }
 
+		public AiActionType ActionType { get; set; }
+		public AiViewContextDC ViewContext { get; set; }
+
 		public bool CanSendNewMessage { get; set; }
 		public bool SendAfterLoaded { get; set; }
 		public AiConversationListVM ListVM { get; set; }
@@ -126,6 +132,8 @@ namespace BeWo.ViewModel.View.AI
 		public AiPromptbausteinPromptVM PromptInput { get; set; }
 		public AiPromptbausteinRoutineVM RoutineInput { get; set; }
 
+		public List<AiMenuItemTemplate> AssistentCommands { get; protected set; }
+
 		public bool IsSettingsOpen
 		{
 			get => _IsSettingsOpen;
@@ -155,9 +163,6 @@ namespace BeWo.ViewModel.View.AI
 		}
 		public bool IsNewConversationVisible => ListVM.SelectedVM is null;
 
-		public AiActionType ActionType { get; set; }
-		public AiViewContextDC ViewContext { get; set; }
-
 		public AiPromptbausteinPromptVM SavePromptVM
 		{
 			get => _SavePromptVM;
@@ -519,5 +524,25 @@ namespace BeWo.ViewModel.View.AI
 		{
 			SavePromptVM = null;
 		}
+
+		public void ImportAssistentCommand(AiMenuItemTemplate origin)
+		{
+			var origin_command = origin.Command;
+
+			var new_command = new DelegateCommand<AiConversationMessageVM>(x =>
+			{
+				origin_command.Execute(x);
+				Close();
+			});
+
+			var imported_menu_item = new AiMenuItemTemplate()
+			{
+				Command = new_command,
+				Icon = origin.Icon,
+				Name = origin.Name
+			};
+
+			AssistentCommands.Add(imported_menu_item);
+		}
 	}
 }