diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm
index 2083803c6d..3c3ff0e622 100644
--- a/src/plugins/platforms/cocoa/qcocoawindow.mm
+++ b/src/plugins/platforms/cocoa/qcocoawindow.mm
@@ -1511,15 +1511,7 @@ void QCocoaWindow::recreateWindowIfNeeded()
 
     if (isEmbeddedView) {
         // An embedded window doesn't have its own NSWindow.
-    } else if (!parentWindow) {
-        // QPlatformWindow subclasses must sync up with QWindow on creation:
-        propagateSizeHints();
-        setWindowFlags(window()->flags());
-        setWindowTitle(window()->title());
-        setWindowFilePath(window()->filePath()); // Also sets window icon
-        setWindowState(window()->windowState());
-        setOpacity(window()->opacity());
-    } else {
+    } else if (parentWindow) {
         // Child windows have no NSWindow, re-parent to superview instead
         [parentCocoaWindow->m_view addSubview:m_view];
         [m_view setHidden:!window()->isVisible()];
diff --git a/src/plugins/platforms/cocoa/qnswindow.mm b/src/plugins/platforms/cocoa/qnswindow.mm
index d7418b8abf..6244d5d129 100644
--- a/src/plugins/platforms/cocoa/qnswindow.mm
+++ b/src/plugins/platforms/cocoa/qnswindow.mm
@@ -196,6 +196,28 @@ static bool isMouseEvent(NSEvent *ev)
     return m_platformWindow;
 }
 
+- (void)setContentView:(NSView*)view
+{
+    [super setContentView:view];
+
+    if (!qnsview_cast(self.contentView))
+        return;
+
+    // Now that we're the content view, we can apply the properties of
+    // the QWindow. We do this here, instead of in init, so that we can
+    // use the same code paths for setting these properties during
+    // NSWindow initialization as we do when setting them later on.
+    const QWindow *window = m_platformWindow->window();
+    qCDebug(lcQpaWindow) << "Reflecting" << window << "state to" << self;
+
+    m_platformWindow->propagateSizeHints();
+    m_platformWindow->setWindowFlags(window->flags());
+    m_platformWindow->setWindowTitle(window->title());
+    m_platformWindow->setWindowFilePath(window->filePath()); // Also sets window icon
+    m_platformWindow->setWindowState(window->windowState());
+    m_platformWindow->setOpacity(window->opacity());
+}
+
 - (NSString *)description
 {
     NSMutableString *description = [NSMutableString stringWithString:[super description]];