diff --git a/Data/Access/SearchDAO.cs b/Data/Access/SearchDAO.cs
index 2094361fa..2064215af 100644
--- a/Data/Access/SearchDAO.cs
+++ b/Data/Access/SearchDAO.cs
@@ -2798,6 +2798,7 @@ WHERE sc.Billable = 1 and sr.StartDate >= '{0:yyyy-MM-dd}' and sr.StartDate < '{
 
 			var criteria = GetAiPromptbausteineFolderRoot(aiActionType);
 
+			criteria.Add(Restrictions.Eq(nameof(AiPromptbausteinFolder.IsPublic), true));
 			criteria.Add(Restrictions.Not(Restrictions.Eq(nameof(AiPromptbausteinFolder.CreatorOid), user_oid)));
 
 			return criteria.List<AiPromptbausteinFolder>();
diff --git a/Shared/DataContracts/AiPromptbausteinFolderDC.cs b/Shared/DataContracts/AiPromptbausteinFolderDC.cs
index c1fef0c2f..d8aa458c4 100644
--- a/Shared/DataContracts/AiPromptbausteinFolderDC.cs
+++ b/Shared/DataContracts/AiPromptbausteinFolderDC.cs
@@ -110,7 +110,7 @@ namespace BS.Shared.DataContracts
 				SubPrompts = new List<AiPromptbausteinPromptDC>(),
 				Title = string.Format(AiPromptbausteineTexts.PublicSharedBibNodeTitle, display),
 				Version = 1,
-				IsExpanded = true
+				IsExpanded = false
 			};
 		}