diff --git a/lcl/interfaces/carbon/carbonwsforms.pp b/lcl/interfaces/carbon/carbonwsforms.pp
index f87b548265..984097750c 100644
--- a/lcl/interfaces/carbon/carbonwsforms.pp
+++ b/lcl/interfaces/carbon/carbonwsforms.pp
@@ -160,7 +160,7 @@ class function TCarbonWSCustomForm.CreateHandle(const AWinControl: TWinControl;
 var
   frm : TCustomForm;
 begin
-  if csDesigning in AWinControl.ComponentState then
+  if IsFormDesign(AWinControl) then
     Result := TLCLIntfHandle(TCarbonDesignWindow.Create(AWinControl, AParams))
   else
     Result := TLCLIntfHandle(TCarbonWindow.Create(AWinControl, AParams));