1 files changed, 7 insertions, 4 deletions
diff --git a/src/corelib/fpg_main.pas b/src/corelib/fpg_main.pas
index 2e255923..df9a78e7 100644
--- a/src/corelib/fpg_main.pas
+++ b/src/corelib/fpg_main.pas
@@ -2015,10 +2015,13 @@ begin
 
   FModalForWin := nil;
 
-  if (AOwner <> nil) and (AOwner is TfpgWindow) then
-    FWindowType   := wtChild
-  else
-    FWindowType   := wtWindow;
+  if not (FWindowType in [wtModalForm, wtPopup]) then
+  begin
+    if (AOwner <> nil) and (AOwner is TfpgWindow) then
+      FWindowType   := wtChild
+    else
+      FWindowType   := wtWindow;
+  end;
 
   FCanvas := CreateCanvas;
 end;