diff --git a/src/gui/widgets/qtoolbarlayout.cpp b/src/gui/widgets/qtoolbarlayout.cpp
index b669f42..739cfa2 100644
--- a/src/gui/widgets/qtoolbarlayout.cpp
+++ b/src/gui/widgets/qtoolbarlayout.cpp
@@ -92,7 +92,7 @@ QToolBarLayout::QToolBarLayout(QWidget *parent)
     QObject::connect(tb, SIGNAL(orientationChanged(Qt::Orientation)),
                      extension, SLOT(setOrientation(Qt::Orientation)));
 
-    setUsePopupMenu(qobject_cast<QMainWindow*>(tb->parentWidget()) == 0);
+    setUsePopupMenu(true);
 }
 
 QToolBarLayout::~QToolBarLayout()
@@ -142,6 +142,7 @@ void QToolBarLayout::setUsePopupMenu(bool set)
         extension->setPopupMode(QToolButton::InstantPopup);
         if (!popupMenu) {
             popupMenu = new QMenu(extension);
+            popupMenu->setWindowFlags(popupMenu->windowFlags());
         }
         extension->setMenu(popupMenu);
     }
@@ -152,7 +153,7 @@ void QToolBarLayout::checkUsePopupMenu()
     QToolBar *tb = static_cast<QToolBar *>(parent());
     QMainWindow *mw = qobject_cast<QMainWindow *>(tb->parent());
     Qt::Orientation o = tb->orientation();
-    setUsePopupMenu(!mw || tb->isFloating() || perp(o, expandedSize(mw->size())) >= perp(o, mw->size()));
+    setUsePopupMenu(true);
 }
 
 void QToolBarLayout::addItem(QLayoutItem*)