diff --git a/src/Fl_cocoa.mm b/src/Fl_cocoa.mm
index 7a209985f..be236011e 100644
--- a/src/Fl_cocoa.mm
+++ b/src/Fl_cocoa.mm
@@ -2611,6 +2611,8 @@ static void set_subwindow_frame(Fl_Window *w) { // maps a subwindow at its corre
   rp.size = NSMakeSize(w->w(), w->h());
   if (!NSEqualRects(rp, [xid frame])) {
     [xid setFrame:rp display:YES];
+  }
+  if (![xid parentWindow]) {
     [pxid addChildWindow:xid ordered:NSWindowAbove]; // needs OS X 10.2
     [xid orderWindow:NSWindowAbove relativeTo:[pxid windowNumber]]; // necessary under 10.3
   }
@@ -2913,7 +2915,7 @@ void Fl_Window::resize(int X,int Y,int W,int H) {
         size_range(W, H, W, H);
       }
       Fl_Group::resize(X,Y,W,H);
-      if (parent()) set_subwindow_frame(this);
+      if ([i->xid parentWindow]) set_subwindow_frame(this);
       // make sure that subwindows of this window don't leak out of their parent window
       NSArray *children = [fl_xid(this) childWindows]; // 10.2
       NSEnumerator *enumerator = [children objectEnumerator];