diff --git a/BeWo/ViewModel/View/AI/AiPromptbausteinComplexSelectionViewModel.cs b/BeWo/ViewModel/View/AI/AiPromptbausteinComplexSelectionViewModel.cs
index f0e4759b1..42869946b 100644
--- a/BeWo/ViewModel/View/AI/AiPromptbausteinComplexSelectionViewModel.cs
+++ b/BeWo/ViewModel/View/AI/AiPromptbausteinComplexSelectionViewModel.cs
@@ -233,6 +233,8 @@ namespace BeWo.ViewModel.View.AI
 					(new_dcs) => ReloadVMList());
 			};
 
+			Close();
+
 			WindowService.Show(vm);
 		}
 		void OpenEditFolderDialog()
@@ -240,6 +242,8 @@ namespace BeWo.ViewModel.View.AI
 			var sel_folder = SelectedFolder;
 			var sel_dc = sel_folder.CopyToEmptyDataContract();
 			sel_dc.CanEdit = SelectedFolder.CanEdit;
+			sel_dc.Oid = sel_folder.DataContract.Oid;
+			sel_dc.Version = sel_folder.DataContract.Version;
 			var edit_vm = new AiPromptbausteinFolderVM(sel_dc);
 
 			var vm = new AiPromptbausteinFolderViewModel(edit_vm, false);
@@ -252,6 +256,8 @@ namespace BeWo.ViewModel.View.AI
 					(update_dc) => ReloadVMList());
 			};
 
+			Close();
+
 			WindowService.Show(vm);
 		}
 		void DeleteFolder()
@@ -300,6 +306,8 @@ namespace BeWo.ViewModel.View.AI
 					(new_dcs) => ReloadVMList());
 			};
 
+			Close();
+
 			WindowService.Show(vm);
 		}
 		void OpenEditPromptDialog()
@@ -307,6 +315,8 @@ namespace BeWo.ViewModel.View.AI
 			var sel_prompt = SelectedPrompt;
 			var sel_dc = sel_prompt.CopyToEmptyDataContract();
 			sel_dc.CanEdit = SelectedPrompt.CanEdit;
+			sel_dc.Oid = sel_prompt.DataContract.Oid;
+			sel_dc.Version = sel_prompt.DataContract.Version;
 			var edit_vm = new AiPromptbausteinPromptVM(sel_dc);
 
 			var vm = new AiPromptbausteinPromptViewModel(edit_vm, false);
@@ -319,6 +329,8 @@ namespace BeWo.ViewModel.View.AI
 					(update_dc) => ReloadVMList());
 			};
 
+			Close();
+
 			WindowService.Show(vm);
 		}
 		void OpenDeletePromptDialog()