diff --git a/components/gridprinter/source/gridprnheaderfooterform.pas b/components/gridprinter/source/gridprnheaderfooterform.pas
index 476663406..aacbd4de3 100644
--- a/components/gridprinter/source/gridprnheaderfooterform.pas
+++ b/components/gridprinter/source/gridprnheaderfooterform.pas
@@ -80,12 +80,13 @@ var
 begin
   delta := TabControl.Height - TabControl.ClientHeight;
   Constraints.MinHeight := delta + clbLineColor.Top + clbLineColor.Height +
-    clbLinecolor.BorderSpacing.Bottom + ButtonPanel1.Height +
+    clbLinecolor.BorderSpacing.Bottom +
+    ButtonPanel1.Height + ButtonPanel1.BorderSpacing.Around * 2;// +
     TabControl.BorderSpacing.Around * 2;
   Constraints.MinWidth := edTextLeft.Left + edTextLeft.Width + Bevel1.Width +
     edTextCenter.Width + Bevel2.Width + edTextRight.Width + edTextRight.BorderSpacing.Right +
     TabControl.BorderSpacing.Around * 2;
-  Width := 0;
+  Width := 0;       // Enforce the constraints
   Height := 0;
 end;