diff --git a/lcl/include/customform.inc b/lcl/include/customform.inc
index 17e4f3ab13..44de1db373 100644
--- a/lcl/include/customform.inc
+++ b/lcl/include/customform.inc
@@ -360,7 +360,7 @@ begin
   if FPopupMode <> AValue then
   begin
     FPopupMode := AValue;
-    if (FPopupMode = pmAuto) and (PopupParent <> nil) then
+    if (FPopupMode in [pmAuto, pmNone]) and (PopupParent <> nil) then
       PopupParent := nil
     else
     if not (csDesigning in ComponentState) and HandleAllocated then