diff --git a/ide/customformeditor.pp b/ide/customformeditor.pp
index 0edae8db98..f560a1d171 100644
--- a/ide/customformeditor.pp
+++ b/ide/customformeditor.pp
@@ -620,6 +620,8 @@ Begin
 
       if (AForm <> nil) then
       begin
+        AForm.ControlStyle:=AForm.ControlStyle+[csNoDesignVisible];
+        LCLIntf.ShowWindow(AForm.Handle,SW_HIDE);
         FNonFormForms.Remove(AForm);
         (AForm as INonFormDesigner).LookupRoot := nil;
         Application.ReleaseComponent(AForm);