diff --git a/components/ideintf/menuintf.pas b/components/ideintf/menuintf.pas
index 05fd37422c..906f2064d1 100644
--- a/components/ideintf/menuintf.pas
+++ b/components/ideintf/menuintf.pas
@@ -90,7 +90,8 @@ type
   public
     property Bitmap: TBitmap read GetBitmap write SetBitmap;
     property Section: TIDEMenuSection read FSection write SetSection;
-    property MenuItem: TMenuItem read FMenuItem write SetMenuItem; // Note: root section MenuItem = TMenu.Items, setting a non root does not add to Section.MenuItem
+    // Note: root section MenuItem=TMenu.Items, setting a non root does not add to Section.MenuItem
+    property MenuItem: TMenuItem read FMenuItem write SetMenuItem;
     property MenuItemClass: TMenuItemClass read FMenuItemClass write FMenuItemClass;
     property SectionIndex: Integer read FSectionIndex;
     property Tag: Integer read FTag write FTag;
diff --git a/packager/pkgmanager.pas b/packager/pkgmanager.pas
index fdb7060b5f..8e7f49c980 100644
--- a/packager/pkgmanager.pas
+++ b/packager/pkgmanager.pas
@@ -5385,8 +5385,7 @@ begin
   end;
 end;
 
-function TPkgManager.ApplyDependency(CurDependency: TPkgDependency
-  ): TModalResult;
+function TPkgManager.ApplyDependency(CurDependency: TPkgDependency): TModalResult;
 // apply
 var
   OldPkg: TLazPackage;
@@ -5416,10 +5415,11 @@ end;
 function TPkgManager.GetPackageOfEditorItem(Sender: TObject): TIDEPackage;
 begin
   Result:=nil;
+  if Sender is TIDEMenuItem then
+    Sender:=TIDEMenuItem(Sender).MenuItem;
   while (Sender is TMenuItem) and (TMenuItem(Sender).Parent<>nil) do
     Sender:=TMenuItem(Sender).Parent;
-  if (Sender is TMenuItem) and (TMenuItem(Sender).Menu<>nil)
-  then
+  if (Sender is TMenuItem) and (TMenuItem(Sender).Menu<>nil) then
     Sender:=TMenuItem(Sender).Menu;
   if (Sender is TComponent) and (TComponent(Sender).Owner is TCustomForm) then
     Sender:=TCustomForm(TComponent(Sender).Owner);