diff --git a/ide/main.pp b/ide/main.pp
index 306acd765c..f3d56fd7c9 100644
--- a/ide/main.pp
+++ b/ide/main.pp
@@ -3972,7 +3972,11 @@ begin
   if Assigned(ASrcEdit) then
     PkgFile:=PackageGraph.FindFileInAllPackages(AnUnitInfo.Filename,true,
                                             not AnUnitInfo.IsPartOfProject);
-  MainIDEBar.itmPkgOpenPackageOfCurUnit.Enabled:=Assigned(PkgFile);
+  with MainIDEBar do begin
+    itmPkgOpenPackageOfCurUnit.Enabled:=Assigned(PkgFile);
+    itmPkgAddCurUnitToPkg.Enabled:=
+        (not AnUnitInfo.IsVirtual) and FileExistsUTF8(AnUnitInfo.Filename);
+  end;
 end;
 
 {------------------------------------------------------------------------------}
diff --git a/packager/pkgmanager.pas b/packager/pkgmanager.pas
index 60c1e04140..8a52b3b73c 100644
--- a/packager/pkgmanager.pas
+++ b/packager/pkgmanager.pas
@@ -3319,8 +3319,7 @@ begin
   // check if filename is absolute
   if ActiveUnitInfo.IsVirtual or (not FileExistsUTF8(Filename)) then begin
     Result:=IDEMessageDialog(lisPkgMangFileNotSaved,
-      lisPkgMangPleaseSaveTheFileBeforeAddingItToAPackage,
-      mtWarning,[mbCancel]);
+      lisPkgMangPleaseSaveTheFileBeforeAddingItToAPackage, mtWarning,[mbCancel]);
     exit;
   end;