diff --git a/packager/frames/package_integration_options.lfm b/packager/frames/package_integration_options.lfm
index 8114e1d2ff..f5f74b7a77 100644
--- a/packager/frames/package_integration_options.lfm
+++ b/packager/frames/package_integration_options.lfm
@@ -141,6 +141,8 @@ inherited PackageIntegrationOptionsFrame: TPackageIntegrationOptionsFrame
       Top = 36
       Width = 116
       BorderSpacing.Around = 6
+      OnEnter = FPDocPackageNameEditEnter
+      OnExit = FPDocPackageNameEditExit
       ParentShowHint = False
       ShowHint = True
       TabOrder = 1
diff --git a/packager/frames/package_integration_options.pas b/packager/frames/package_integration_options.pas
index 8d1721771a..c18c0e51f9 100644
--- a/packager/frames/package_integration_options.pas
+++ b/packager/frames/package_integration_options.pas
@@ -21,6 +21,8 @@ type
     FPDocSearchPathsEdit: TEdit;
     PkgTypeRadioGroup: TRadioGroup;
     UpdateRadioGroup: TRadioGroup;
+    procedure FPDocPackageNameEditEnter(Sender: TObject);
+    procedure FPDocPackageNameEditExit(Sender: TObject);
     procedure PkgTypeRadioGroupClick(Sender: TObject);
   private
     FLazPackage: TLazPackage;
@@ -60,6 +62,20 @@ begin
   end;
 end;
 
+procedure TPackageIntegrationOptionsFrame.FPDocPackageNameEditEnter(
+  Sender: TObject);
+begin
+  if FPDocPackageNameEdit.Text=lisDefaultPlaceholder then
+    FPDocPackageNameEdit.Text:='';
+end;
+
+procedure TPackageIntegrationOptionsFrame.FPDocPackageNameEditExit(
+  Sender: TObject);
+begin
+  if FPDocPackageNameEdit.Text='' then
+    FPDocPackageNameEdit.Text:=lisDefaultPlaceholder;
+end;
+
 procedure TPackageIntegrationOptionsFrame.PathEditBtnClick(Sender: TObject);
 var
   AButton: TPathEditorButton absolute Sender;
@@ -176,7 +192,10 @@ begin
       UpdateRadioGroup.ItemIndex := 2;
   end;
   FPDocSearchPathsEdit.Text:=LazPackage.FPDocPaths;
-  FPDocPackageNameEdit.Text:=LazPackage.FPDocPackageName;
+  if LazPackage.FPDocPackageName='' then
+    FPDocPackageNameEdit.Text:=lisDefaultPlaceholder
+  else
+    FPDocPackageNameEdit.Text:=LazPackage.FPDocPackageName;
 end;
 
 function TPackageIntegrationOptionsFrame.ShowMsgPackageTypeMustBeDesign: boolean;
@@ -224,7 +243,10 @@ begin
       LazPackage.AutoUpdate := pupAsNeeded;
   end;
   LazPackage.FPDocPaths := FPDocSearchPathsEdit.Text;
-  LazPackage.FPDocPackageName := FPDocPackageNameEdit.Text;
+  if FPDocPackageNameEdit.Text=lisDefaultPlaceholder then
+    LazPackage.FPDocPackageName := ''
+  else
+    LazPackage.FPDocPackageName := FPDocPackageNameEdit.Text;
 end;
 
 class function TPackageIntegrationOptionsFrame.SupportedOptionsClass: TAbstractIDEOptionsClass;