diff --git a/designer/menueditorform.lfm b/designer/menueditorform.lfm
index d2ff12f0c4..5771f66026 100644
--- a/designer/menueditorform.lfm
+++ b/designer/menueditorform.lfm
@@ -8,7 +8,6 @@ object MenuDesigner: TMenuDesigner
   ClientWidth = 730
   Constraints.MinHeight = 345
   Constraints.MinWidth = 730
-  FormStyle = fsStayOnTop
   KeyPreview = True
   OnCreate = FormCreate
   OnDestroy = FormDestroy
diff --git a/designer/menueditorform.pas b/designer/menueditorform.pas
index 2c6a0d43b5..f579297430 100644
--- a/designer/menueditorform.pas
+++ b/designer/menueditorform.pas
@@ -28,7 +28,7 @@ interface
 uses
   Buttons, Classes, ComponentEditors, Controls, ExtCtrls, Forms,
   Graphics, LazarusIDEStrConsts, LazIDEIntf, LCLintf, LCLProc, Menus,
-  MenuShadows, PropEdits, StdCtrls, SysUtils;
+  MenuShadows, PropEdits, StdCtrls, SysUtils, FormEditingIntf;
 
 type
 
@@ -143,6 +143,11 @@ begin
   if (aMenu = nil) then
     RaiseGDBException(lisMenuEditorShowMenuEditorTMenuParameterIsNil);
   MenuDesigner.SetMenu(aMenu, nil);
+  MenuDesigner.PopupParent:=GetParentForm(FormEditingHook.GetCurrentObjectInspector, True);
+  if MenuDesigner.PopupParent<>nil then
+    MenuDesigner.PopupMode:=pmExplicit
+  else
+    MenuDesigner.PopupMode:=pmNone;
   MenuDesigner.ShowOnTop;
 end;