2883,2884c2880,2884
<     if (PopupMode = pmNone) and HandleAllocated then
<       RecreateWnd(Self); // need to refresh handle for pmNone because ParentWindow changes if (fsModal in FFormState) - see GetRealPopupParent
---
>     if PopupMode = pmNone then
>     begin
>       RecreateWnd(Self);
>       HandleNeeded;
>     end;
2953,2954d2952
<       if ((PopupMode = pmNone) and HandleAllocated) and not (csDestroying in ComponentState) then
<         RecreateWnd(Self); // need to refresh handle for pmNone because ParentWindow changes if (fsModal in FFormState) - see GetRealPopupParent