1 files changed, 6 insertions, 4 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm
index e74f9dcfe0..4e567c6c63 100644
--- a/src/plugins/platforms/cocoa/qcocoawindow.mm
+++ b/src/plugins/platforms/cocoa/qcocoawindow.mm
@@ -211,9 +211,8 @@ QCocoaWindow::QCocoaWindow(QWindow *tlw)
     m_qtView = [[QNSView alloc] initWithQWindow:tlw platformWindow:this];
     m_contentView = m_qtView;
     setGeometry(tlw->geometry());
-
     recreateWindow(parent());
-
+    tlw->setGeometry(geometry());
     m_inConstructor = false;
 }
 
@@ -395,8 +394,11 @@ NSUInteger QCocoaWindow::windowStyleMask(Qt::WindowFlags flags)
                  Qt::WindowMinMaxButtonsHint | Qt::WindowCloseButtonHint;
         if (flags == Qt::Window) {
             styleMask = (NSResizableWindowMask | NSClosableWindowMask | NSMiniaturizableWindowMask | NSTitledWindowMask);
-        } else if ((flags & Qt::Dialog) && (window()->modality() != Qt::NonModal)) {
-            styleMask = NSResizableWindowMask | NSTitledWindowMask;
+        } else if (flags & Qt::Dialog) {
+            if (window()->modality() == Qt::NonModal)
+                styleMask = NSResizableWindowMask | NSClosableWindowMask | NSTitledWindowMask;
+            else
+                styleMask = NSResizableWindowMask | NSTitledWindowMask;
         } else if (!(flags & Qt::FramelessWindowHint)) {
             if ((flags & Qt::Dialog) || (flags & Qt::WindowMaximizeButtonHint))
                 styleMask |= NSResizableWindowMask;