diff --git a/src/qt/frame.cpp b/src/qt/frame.cpp
index be927ce2cd..20c84d747a 100644
--- a/src/qt/frame.cpp
+++ b/src/qt/frame.cpp
@@ -134,15 +134,16 @@ void wxFrame::SetWindowStyleFlag( long style )
 {
     wxWindow::SetWindowStyleFlag( style );
 
-    QMainWindow *qtFrame = GetQMainWindow();
-    Qt::WindowFlags qtFlags = qtFrame->windowFlags();
-    qtFlags |= Qt::CustomizeWindowHint;
+    Qt::WindowFlags qtFlags = Qt::CustomizeWindowHint;
 
     if ( HasFlag( wxFRAME_TOOL_WINDOW ) )
     {
-        qtFlags &= ~Qt::WindowType_Mask;
         qtFlags |= Qt::Tool;
     }
+    else
+    {
+        qtFlags |= Qt::Window;
+    }
 
     if ( HasFlag(wxCAPTION) )
     {
@@ -183,8 +184,7 @@ void wxFrame::SetWindowStyleFlag( long style )
         qtFlags |= Qt::FramelessWindowHint;
     }
 
-    qtFrame->setWindowFlags(qtFlags);
-
+    GetQMainWindow()->setWindowFlags(qtFlags);
 }
 
 void wxFrame::AddChild( wxWindowBase *child )