diff --git a/designer/componenteditors.pas b/designer/componenteditors.pas
index 505e87f907..1c8f2e2f98 100644
--- a/designer/componenteditors.pas
+++ b/designer/componenteditors.pas
@@ -399,6 +399,7 @@ var
   end;
 
 begin
+  Continue:=false;
   if not Assigned(FFirst)
   and (Prop is TMethodPropertyEditor) then
     FFirst := Prop;
diff --git a/designer/controlselection.pp b/designer/controlselection.pp
index 5698faf6ba..620aded3d0 100644
--- a/designer/controlselection.pp
+++ b/designer/controlselection.pp
@@ -1916,8 +1916,9 @@ var
   
 begin
   if (Count=0) or (FCustomForm=nil)
-  or IsSelected(FCustomForm) then exit;
-  
+  or IsSelected(FCustomForm)
+  or (Items[0].Component is TMenuItem) then exit;
+
   Diff:=DC.FormOrigin;
 
   {writeln('[DrawGrabbers] '
@@ -1976,7 +1977,8 @@ begin
   if (Count<2)
   or (FCustomForm=nil)
   or (AComponent.Owner<>DC.Form)
-  or (not IsSelected(AComponent)) then exit;
+  or (not IsSelected(AComponent))
+  or (AComponent is TMenuItem) then exit;
   
   GetComponentBounds(AComponent,CompLeft,CompTop,CompWidth,CompHeight);
   CompOrigin:=GetParentFormRelativeParentClientOrigin(AComponent);
diff --git a/designer/objectinspector.pp b/designer/objectinspector.pp
index 78d5130704..ca7b58b462 100644
--- a/designer/objectinspector.pp
+++ b/designer/objectinspector.pp
@@ -35,7 +35,7 @@ uses
   Forms, SysUtils, Buttons, Classes, Graphics, GraphType, StdCtrls, LCLType,
   LCLLinux, LMessages, Controls, ComCtrls, ExtCtrls, TypInfo, Messages,
   LResources, Laz_XMLCfg, Menus, Dialogs, ObjInspStrConsts,
-  PropEdits, GraphPropEdits, ListViewPropEdit,ImageListEditor;
+  PropEdits, GraphPropEdits, ListViewPropEdit, ImageListEditor;
 
 
 type