diff --git a/lcl/interfaces/gtk3/gtk3lclbutton.inc b/lcl/interfaces/gtk3/gtk3lclbutton.inc
index 34366bd45b..1e40b121fd 100644
--- a/lcl/interfaces/gtk3/gtk3lclbutton.inc
+++ b/lcl/interfaces/gtk3/gtk3lclbutton.inc
@@ -87,7 +87,7 @@ begin
   end;
 
  // we respect ws height if autosize is true.
-  if AControl.LCLObject.AutoSize then
+  if AControl.LCLObject.AutoSize and (AControl.LCLObject.BorderSpacing.InnerBorder = 0) then
     exit;
 
   // Custom height handling