diff --git a/ide/main.pp b/ide/main.pp
index 045fb0dad9..bff250ba28 100644
--- a/ide/main.pp
+++ b/ide/main.pp
@@ -401,7 +401,6 @@ type
     procedure UpdateMainIDECommands(Sender: TObject);
     procedure UpdateFileCommands(Sender: TObject);
     procedure UpdateEditorCommands(Sender: TObject);
-    procedure UpdateBookmarkCommands(Sender: TObject);
     procedure UpdateEditorTabCommands(Sender: TObject);
     procedure UpdateProjectCommands(Sender: TObject);
     procedure UpdatePackageCommands(Sender: TObject);
@@ -428,6 +427,7 @@ type
     procedure LayoutChangeHandler(Sender: TObject);
     procedure ToolBarOptionsClick(Sender: TObject);
   public
+    procedure UpdateBookmarkCommands(Sender: TObject); override;
     // Environment options dialog event handlers
     function DoOpenIDEOptions(AEditor: TAbstractIDEOptionsEditorClass;
       ACaption: String; AOptionsFilter: array of TAbstractIDEOptionsClass;
diff --git a/ide/mainintf.pas b/ide/mainintf.pas
index 47258a8d70..4397dbec4a 100644
--- a/ide/mainintf.pas
+++ b/ide/mainintf.pas
@@ -124,6 +124,7 @@ type
     constructor Create(TheOwner: TComponent); override;
     destructor Destroy; override;
 
+    procedure UpdateBookmarkCommands(Sender: TObject); virtual; abstract;
     procedure SetMainBarSubTitle(const AValue: string); override;
     procedure UpdateCaption; virtual; abstract;
     procedure HideIDE; virtual; abstract;
diff --git a/ide/sourceeditor.pp b/ide/sourceeditor.pp
index 1f303bda43..ebaf4bf0fe 100644
--- a/ide/sourceeditor.pp
+++ b/ide/sourceeditor.pp
@@ -1882,6 +1882,7 @@ end;
 
 procedure TToolButton_GotoBookmarks.RefreshMenu;
 begin
+  MainIDEInterface.UpdateBookmarkCommands(nil);
   AddMenuItems(SrcEditMenuGotoBookmark);
   DropdownMenu.Items.AddSeparator;
   AddMenuItems([
@@ -1904,6 +1905,7 @@ end;
 
 procedure TToolButton_ToggleBookmarks.RefreshMenu;
 begin
+  MainIDEInterface.UpdateBookmarkCommands(nil);
   AddMenuItems(SrcEditMenuToggleBookmark);
   DropdownMenu.Items.AddSeparator;
   AddMenuItem(SrcEditMenuSetFreeBookmark);