diff --git a/Libraries/UniversalEditor.UserInterface/Engine.cs b/Libraries/UniversalEditor.UserInterface/Engine.cs
index 9c2be56a..ac2c072a 100644
--- a/Libraries/UniversalEditor.UserInterface/Engine.cs
+++ b/Libraries/UniversalEditor.UserInterface/Engine.cs
@@ -559,6 +559,7 @@ namespace UniversalEditor.UserInterface
 				Application.Commands["Bookmarks"].Items.Add(new CommandReferenceCommandItem(String.Format("Bookmarks_Bookmark{0}", (BookmarksManager.FileNames.Count - 1).ToString())));
 
 				Application.AttachCommandEventHandler(String.Format("Bookmarks_Bookmark{0}", (BookmarksManager.FileNames.Count - 1).ToString()), Bookmarks_Bookmark_Click);
+				ShowBookmarksManagerDialog();
 			});
 			Application.AttachCommandEventHandler("BookmarksAddAll", delegate (object sender, EventArgs e)
 			{
@@ -586,14 +587,12 @@ namespace UniversalEditor.UserInterface
 						Application.AttachCommandEventHandler(String.Format("Bookmarks_Bookmark{0}", (BookmarksManager.FileNames.Count - 1).ToString()), Bookmarks_Bookmark_Click);
 					}
 				}
+
+				ShowBookmarksManagerDialog();
 			});
 			Application.AttachCommandEventHandler("BookmarksManage", delegate (object sender, EventArgs e)
 			{
-				ManageBookmarksDialog dlg = new ManageBookmarksDialog();
-				if (dlg.ShowDialog() == DialogResult.OK)
-				{
-					// saving the BookmarksManager state is handled by the ManageBookmarksDialog
-				}
+				ShowBookmarksManagerDialog();
 			});
 			#endregion
 			#region Tools
@@ -744,6 +743,15 @@ namespace UniversalEditor.UserInterface
 			
 		}
 
+		private void ShowBookmarksManagerDialog()
+		{
+			ManageBookmarksDialog dlg = new ManageBookmarksDialog();
+			if (dlg.ShowDialog() == DialogResult.OK)
+			{
+				// saving the BookmarksManager state is handled by the ManageBookmarksDialog
+			}
+		}
+
 		private IHostApplicationWindowCollection mvarWindows = new IHostApplicationWindowCollection();
 		public IHostApplicationWindowCollection Windows { get { return mvarWindows; } }