diff --git a/BeWo/ViewModel/View/Administration/AiPromptbausteinFolderViewModel.cs b/BeWo/ViewModel/View/Administration/AiPromptbausteinFolderViewModel.cs
index 26bd1184d..759ca4eca 100644
--- a/BeWo/ViewModel/View/Administration/AiPromptbausteinFolderViewModel.cs
+++ b/BeWo/ViewModel/View/Administration/AiPromptbausteinFolderViewModel.cs
@@ -20,13 +20,10 @@ namespace BeWo.ViewModel.View.Administration
 			ViewModel = viewModel;
 			_IsNew = isNew;
 
-			if (!_IsNew)
+			ViewModel.PropertyChanged += (s, e) =>
 			{
-				ViewModel.PropertyChanged += (s, e) =>
-				{
-					AcceptCommand.RaiseCanExecuteChanged();
-				};
-			}
+				AcceptCommand.RaiseCanExecuteChanged();
+			};
 		}
 
 		public AiPromptbausteinFolderVM ViewModel { get; set; }
@@ -35,7 +32,7 @@ namespace BeWo.ViewModel.View.Administration
 
 		protected override bool canAccept()
 		{
-			return _IsNew || ViewModel.IsDirty;
+			return (_IsNew || ViewModel.IsDirty) && !string.IsNullOrWhiteSpace(ViewModel.Title);
 		}
 	}
 }