diff --git a/lcl/include/customform.inc b/lcl/include/customform.inc
index 53068a0314..7e4d229b00 100644
--- a/lcl/include/customform.inc
+++ b/lcl/include/customform.inc
@@ -2318,6 +2318,10 @@ end;
 ------------------------------------------------------------------------------}
 procedure TCustomForm.Show;
 begin
+  if Scaled and (Monitor.PixelsPerInch<>PixelsPerInch) then
+    AutoAdjustLayout(lapAutoAdjustForDPI, PixelsPerInch, Monitor.PixelsPerInch,
+      Width, MulDiv(Width, Monitor.PixelsPerInch, PixelsPerInch), True);
+
   Visible := True;
   BringToFront;
 end;