2 files changed, 10 insertions, 1 deletions
diff --git a/src/controls/qtmenupopupwindow.cpp b/src/controls/qtmenupopupwindow.cpp
index 64fdd11f3..4e461c217 100644
--- a/src/controls/qtmenupopupwindow.cpp
+++ b/src/controls/qtmenupopupwindow.cpp
@@ -141,6 +141,13 @@ void QtMenuPopupWindow::mouseMoveEvent(QMouseEvent *e)
         forwardEventToTransientParent(e);
 }
 
+void QtMenuPopupWindow::mousePressEvent(QMouseEvent *e)
+{
+    QRect rect = QRect(QPoint(), size());
+    if (!rect.contains(e->pos()))
+        forwardEventToTransientParent(e);
+}
+
 void QtMenuPopupWindow::mouseReleaseEvent(QMouseEvent *e)
 {
     QRect rect = QRect(QPoint(), size());
@@ -159,7 +166,8 @@ void QtMenuPopupWindow::mouseReleaseEvent(QMouseEvent *e)
 void QtMenuPopupWindow::forwardEventToTransientParent(QMouseEvent *e)
 {
     if (!qobject_cast<QtMenuPopupWindow*>(transientParent())
-        && m_mouseMoved && e->type() == QEvent::MouseButtonRelease) {
+        && (m_mouseMoved && e->type() == QEvent::MouseButtonRelease
+            || e->type() == QEvent::MouseButtonPress)) {
         // Clicked outside any menu
         dismissMenu();
     } else if (transientParent()) {
diff --git a/src/controls/qtmenupopupwindow_p.h b/src/controls/qtmenupopupwindow_p.h
index fef203d39..8eccbfb59 100644
--- a/src/controls/qtmenupopupwindow_p.h
+++ b/src/controls/qtmenupopupwindow_p.h
@@ -68,6 +68,7 @@ Q_SIGNALS:
     void menuDismissed();
 
 protected:
+    void mousePressEvent(QMouseEvent *);
     void mouseReleaseEvent(QMouseEvent *);
     void mouseMoveEvent(QMouseEvent *);