diff --git a/lcl/include/customform.inc b/lcl/include/customform.inc
index 19ca4872ad..95041c6b75 100644
--- a/lcl/include/customform.inc
+++ b/lcl/include/customform.inc
@@ -2573,8 +2573,7 @@ var
 begin
   Result := TBitmap.Create;
   try
-    Result.Width := ClientWidth;
-    Result.Height := ClientHeight;
+    Result.SetSize(ClientWidth, ClientHeight);
     LCLIntf.GetWindowRect(Handle, ARect);
     with GetClientOrigin do
       PaintTo(Result.Canvas, ARect.Left - X, ARect.Top - Y);
diff --git a/lcl/include/wincontrol.inc b/lcl/include/wincontrol.inc
index 936f33442d..209448b6fa 100644
--- a/lcl/include/wincontrol.inc
+++ b/lcl/include/wincontrol.inc
@@ -5027,6 +5027,7 @@ end;
 procedure TWinControl.PaintTo(ACanvas: TCanvas; X, Y: Integer);
 begin
   PaintTo(ACanvas.Handle, X, Y);
+  ACanvas.Changed;
 end;
 
 procedure TWinControl.SetShape(AShape: TBitmap);