diff --git a/lcl/include/wincontrol.inc b/lcl/include/wincontrol.inc
index 4fdf4cb4b1..56b46b0cec 100644
--- a/lcl/include/wincontrol.inc
+++ b/lcl/include/wincontrol.inc
@@ -4820,12 +4820,18 @@ begin
   end;
 
   // size this control
-  AdjustSize;
-  if FControls<>nil then
-    for i:=0 to FControls.Count-1 do
-      TControl(FControls[i]).DoAutoSize;
-  // realign childs
-  ReAlign;
+  DisableAlign;
+  try
+    UpdateShowing;
+    AdjustSize;
+    if FControls<>nil then
+      for i:=0 to FControls.Count-1 do
+        TControl(FControls[i]).DoAutoSize;
+    // realign childs
+    ReAlign;
+  finally
+    EnableAlign;
+  end;
 
   //DebugLn('[TWinControl.CreateWnd] END ',Name,':',Classname);
   //WriteClientRect('D');