diff --git a/designer/menueditorform.lfm b/designer/menueditorform.lfm
index 7446d5bcaf..4e3b00c71c 100644
--- a/designer/menueditorform.lfm
+++ b/designer/menueditorform.lfm
@@ -11,6 +11,8 @@ object MenuDesignerForm: TMenuDesignerForm
   KeyPreview = True
   OnCreate = FormCreate
   OnDestroy = FormDestroy
+  OnHide = FormHide
+  OnShow = FormShow
   Position = poScreenCenter
   ShowHint = True
   LCLVersion = '1.7'
diff --git a/designer/menueditorform.pas b/designer/menueditorform.pas
index 016afeeb7c..88d6854489 100644
--- a/designer/menueditorform.pas
+++ b/designer/menueditorform.pas
@@ -62,6 +62,8 @@ type
     SubmenuGroupBox: TGroupBox;
     procedure FormCreate(Sender: TObject);
     procedure FormDestroy(Sender: TObject);
+    procedure FormHide(Sender: TObject);
+    procedure FormShow(Sender: TObject);
     procedure HelpButtonClick(Sender: TObject);
   strict private
     FDesigner: TMenuDesignerBase;
@@ -244,7 +246,6 @@ begin
   LoadFixedButtonGlyphs;
   LoadVariableButtonGlyphs(True);
   KeyPreview:=True;
-  GlobalDesignHook.AddHandlerSetSelection(@OnDesignerSetSelection);
   InitializeStatisticVars;
   SetupPopupAssignmentsDisplay;
 end;
@@ -254,6 +255,16 @@ begin
   FreeAndNil(FPopupAssignments);
 end;
 
+procedure TMenuDesignerForm.FormShow(Sender: TObject);
+begin
+  GlobalDesignHook.AddHandlerSetSelection(@OnDesignerSetSelection);
+end;
+
+procedure TMenuDesignerForm.FormHide(Sender: TObject);
+begin
+  GlobalDesignHook.RemoveHandlerSetSelection(@OnDesignerSetSelection);
+end;
+
 procedure TMenuDesignerForm.HelpButtonClick(Sender: TObject);
 const
   helpPath = 'http://wiki.lazarus.freepascal.org/IDE_Window:_Menu_Editor';