diff --git a/BeWo/Services/BeWoWindowService.cs b/BeWo/Services/BeWoWindowService.cs
index 8426985d9..f4bf4b8bb 100644
--- a/BeWo/Services/BeWoWindowService.cs
+++ b/BeWo/Services/BeWoWindowService.cs
@@ -180,10 +180,7 @@ namespace BeWo.Services
 		}
 
 		private void Show(string title, Control control, WindowViewModel windowViewModel, BeWoWindowOptions options)
-		{
-			if(control.Focusable)
-				control.Focus();
-
+		{		
 			if (options.ShowAsModal)
 			{
 				var modal = _windowFactory.GetModalViewWindow(title, control, options.Height, options.Width);
diff --git a/BeWo/View/Detail/AI/AiPromptbausteinFolderView.xaml b/BeWo/View/Detail/AI/AiPromptbausteinFolderView.xaml
index 83edd58d5..f803b8d93 100644
--- a/BeWo/View/Detail/AI/AiPromptbausteinFolderView.xaml
+++ b/BeWo/View/Detail/AI/AiPromptbausteinFolderView.xaml
@@ -16,17 +16,14 @@
     Background="{StaticResource ObjectEditBackgroundBrush}"
     Focusable="True"
     mc:Ignorable="d">
-    <UserControl.InputBindings>
-        <KeyBinding Key="Esc" Command="{Binding CancelCommand}" />
-    </UserControl.InputBindings>
-    <UserControl.Resources>
+    <view:BeWoView.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary Source="..\..\..\Styles\ModernOrangeBlack.xaml" />
             </ResourceDictionary.MergedDictionaries>
             <Style BasedOn="{StaticResource PopupBlackLabel2}" TargetType="Label" />
         </ResourceDictionary>
-    </UserControl.Resources>
+    </view:BeWoView.Resources>
     <Grid
         MaxWidth="700"
         Margin="3"
diff --git a/BeWo/View/Detail/AI/AiPromptbausteinPromptView.xaml b/BeWo/View/Detail/AI/AiPromptbausteinPromptView.xaml
index e237be362..8fdbc36c5 100644
--- a/BeWo/View/Detail/AI/AiPromptbausteinPromptView.xaml
+++ b/BeWo/View/Detail/AI/AiPromptbausteinPromptView.xaml
@@ -16,17 +16,14 @@
     Background="{StaticResource ObjectEditBackgroundBrush}"
     Focusable="True"
     mc:Ignorable="d">
-    <UserControl.InputBindings>
-        <KeyBinding Key="Esc" Command="{Binding CancelCommand}" />
-    </UserControl.InputBindings>
-    <UserControl.Resources>
+    <view:BeWoView.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary Source="..\..\..\Styles\ModernOrangeBlack.xaml" />
             </ResourceDictionary.MergedDictionaries>
             <Style BasedOn="{StaticResource PopupBlackLabel2}" TargetType="Label" />
         </ResourceDictionary>
-    </UserControl.Resources>
+    </view:BeWoView.Resources>
     <Grid
         MaxWidth="700"
         Margin="3"
@@ -126,7 +123,7 @@
                 Orientation="Horizontal">
                 <Button
                     Width="100"
-                    Command="{Binding CancelCommand}"
+                    Command="ApplicationCommands.Close"
                     Visibility="Visible">
                     Abbrechen
                 </Button>
diff --git a/BeWo/View/Detail/AI/AiPromptbausteinPromptView2.xaml b/BeWo/View/Detail/AI/AiPromptbausteinPromptView2.xaml
index 8a222f3ba..cc61801c1 100644
--- a/BeWo/View/Detail/AI/AiPromptbausteinPromptView2.xaml
+++ b/BeWo/View/Detail/AI/AiPromptbausteinPromptView2.xaml
@@ -1,5 +1,4 @@
 <view:BeWoView
-    xmlns:view="clr-namespace:BeWo.View"
     x:Class="BeWo.View.Detail.AI.AiPromptbausteinPromptView2"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -9,6 +8,7 @@
     xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid"
     xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:view="clr-namespace:BeWo.View"
     xmlns:viewmodel="clr-namespace:BeWo.ViewModel.View.Administration"
     x:Name="root"
     Width="500"
@@ -16,7 +16,7 @@
     Background="{StaticResource ObjectEditBackgroundBrush}"
     Focusable="True">
     <UserControl.InputBindings>
-        <KeyBinding Key="Esc" Command="{Binding CancelCommand}" />
+        <KeyBinding Key="Esc" Command="ApplicationCommands.Close" />
     </UserControl.InputBindings>
     <UserControl.Resources>
         <ResourceDictionary>
@@ -110,7 +110,7 @@
                 Orientation="Horizontal">
                 <Button
                     Width="100"
-                    Command="{Binding CancelCommand, ElementName=root}"
+                    Command="ApplicationCommands.Close"
                     Visibility="Collapsed">
                     Abbrechen
                 </Button>
diff --git a/BeWo/View/Detail/AI/AiPromptbausteinRoutineView.xaml b/BeWo/View/Detail/AI/AiPromptbausteinRoutineView.xaml
index ec0aef416..be07fb10f 100644
--- a/BeWo/View/Detail/AI/AiPromptbausteinRoutineView.xaml
+++ b/BeWo/View/Detail/AI/AiPromptbausteinRoutineView.xaml
@@ -16,9 +16,6 @@
     Background="{StaticResource ObjectEditBackgroundBrush}"
     Focusable="True"
     mc:Ignorable="d">
-    <UserControl.InputBindings>
-        <KeyBinding Key="Esc" Command="{Binding CancelCommand}" />
-    </UserControl.InputBindings>
     <UserControl.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
@@ -213,15 +210,14 @@
                 Margin="0,19,0,0"
                 HorizontalAlignment="Right"
                 Orientation="Horizontal">
-                <Button Width="100" Command="{Binding CancelCommand}">
+                <Button Width="100" Command="ApplicationCommands.Close">
                     Abbrechen
                 </Button>
                 <Button
                     Width="100"
                     Command="{Binding SaveCommand}"
                     Content="{Binding AcceptButtonText}"
-                    Visibility="Visible">
-                </Button>
+                    Visibility="Visible" />
             </StackPanel>
         </Grid>
     </Grid>
diff --git a/BeWo/View/Windows/AnimatedBeWoWindow.xaml b/BeWo/View/Windows/AnimatedBeWoWindow.xaml
index 55c5b1d80..7e50c5a03 100644
--- a/BeWo/View/Windows/AnimatedBeWoWindow.xaml
+++ b/BeWo/View/Windows/AnimatedBeWoWindow.xaml
@@ -17,6 +17,9 @@
     TextOptions.TextFormattingMode="Display"
     WindowStartupLocation="CenterOwner"
     WindowStyle="None">
+    <Window.InputBindings>
+        <KeyBinding Key="Esc" Command="ApplicationCommands.Close" />
+    </Window.InputBindings>
     <Window.DataContext>
         <view:WindowViewModel />
     </Window.DataContext>
diff --git a/BeWo/View/Windows/AnimatedBeWoWindow.xaml.cs b/BeWo/View/Windows/AnimatedBeWoWindow.xaml.cs
index 626dc44dd..a0b15e24c 100644
--- a/BeWo/View/Windows/AnimatedBeWoWindow.xaml.cs
+++ b/BeWo/View/Windows/AnimatedBeWoWindow.xaml.cs
@@ -253,6 +253,11 @@ namespace BeWo.View.Windows
 		{
 			if (!ServiceFacade.IsWaiting() && _WaitLayer != null)
 				EndWaiting();
+
+			if (rootGroupBox.Content is IInputElement element && element.Focusable)
+			{
+				Keyboard.Focus(element);
+			}
 		}
 
 		private void CommandBinding_Close_Executed(object sender, ExecutedRoutedEventArgs e)
diff --git a/BeWo/ViewModel/AiPromptbausteinFolderVM.cs b/BeWo/ViewModel/AiPromptbausteinFolderVM.cs
index 9cdcb3143..e4d078cbc 100644
--- a/BeWo/ViewModel/AiPromptbausteinFolderVM.cs
+++ b/BeWo/ViewModel/AiPromptbausteinFolderVM.cs
@@ -305,6 +305,9 @@ namespace BeWo.ViewModel
 
 		public override void UpdateByDataContract(AiPromptbausteinFolderDC pDataContract)
 		{
+			if(IsNew)
+				IsNew = false;
+
 			DataContract = pDataContract;
 
 			Title = pDataContract.Title;
diff --git a/BeWo/ViewModel/AiPromptbausteinPromptVM.cs b/BeWo/ViewModel/AiPromptbausteinPromptVM.cs
index 58fa8e50c..a632bec15 100644
--- a/BeWo/ViewModel/AiPromptbausteinPromptVM.cs
+++ b/BeWo/ViewModel/AiPromptbausteinPromptVM.cs
@@ -166,6 +166,9 @@ namespace BeWo.ViewModel
 
 		public override void UpdateByDataContract(AiPromptbausteinPromptDC pDataContract)
 		{
+			if (IsNew)
+				IsNew = false;
+
 			Title = pDataContract.Title;
 			Description = pDataContract.Description;
 			ParentFolderOid = pDataContract.ParentFolderOid;
diff --git a/BeWo/ViewModel/AiPromptbausteinRoutineVM.cs b/BeWo/ViewModel/AiPromptbausteinRoutineVM.cs
index 2ed434b53..537b75c87 100644
--- a/BeWo/ViewModel/AiPromptbausteinRoutineVM.cs
+++ b/BeWo/ViewModel/AiPromptbausteinRoutineVM.cs
@@ -137,6 +137,9 @@ namespace BeWo.ViewModel
 
 		public override void UpdateByDataContract(AiPromptbausteinRoutineDC pDataContract)
 		{
+			if (IsNew)
+				IsNew = false;
+
 			DataContract = pDataContract;
 
 			Title = pDataContract.Title;
diff --git a/Service/BusinessLogic/AiPromptbausteinFolderLogic.cs b/Service/BusinessLogic/AiPromptbausteinFolderLogic.cs
index e785f9ab6..cfaec9f61 100644
--- a/Service/BusinessLogic/AiPromptbausteinFolderLogic.cs
+++ b/Service/BusinessLogic/AiPromptbausteinFolderLogic.cs
@@ -15,40 +15,6 @@ namespace BeWo.Service.BusinessLogic
 	{
 		public override IDCEntityMapper<AiPromptbausteinFolder, AiPromptbausteinFolderDC> Mapper => MapperFactory.AiPromptbausteinFolder;
 
-		public override AiPromptbausteinFolderDC Insert(AiPromptbausteinFolderDC dc)
-		{
-			var canEdit = dc.CanEdit;
-			var canAddFolder = dc.CanAddFolder;
-			var canAddPrompt = dc.CanAddPrompt;
-			var canAddRoutine = dc.CanAddRoutine;
-
-			var dc2 = base.Insert(dc);
-
-			dc2.CanEdit = canEdit;
-			dc2.CanAddFolder = canAddFolder;
-			dc2.CanAddPrompt = canAddPrompt;
-			dc2.CanAddRoutine = canAddRoutine;
-
-			return dc2;
-		}
-
-		public override AiPromptbausteinFolderDC Update(AiPromptbausteinFolderDC dc)
-		{
-			var canEdit = dc.CanEdit;
-			var canAddFolder = dc.CanAddFolder;
-			var canAddPrompt = dc.CanAddPrompt;
-			var canAddRoutine = dc.CanAddRoutine;
-
-			var dc2 = base.Update(dc);
-
-			dc2.CanEdit = canEdit;
-			dc2.CanAddFolder = canAddFolder;
-			dc2.CanAddPrompt = canAddPrompt;
-			dc2.CanAddRoutine = canAddRoutine;
-
-			return dc2;
-		}
-
 		public override void Deactivate(AiPromptbausteinFolderDC dc)
 		{
 			throw new InvalidOperationException();