2 files changed, 9 insertions, 3 deletions

diff --git a/src/ui/util.c b/src/ui/util.c
index 770071a6..a24b3199 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -181,7 +181,13 @@ static iBool menuHandler_(iWidget *menu, const char *cmd) {
             /* Don't reopen self; instead, root will close the menu. */
             return iFalse;
         }
-        if (!equal_Command(cmd, "window.resized")) {
+        if (equal_Command(cmd, "mouse.clicked") && arg_Command(cmd)) {
+            /* Dismiss open menus when clicking outside them. */
+            closeMenu_Widget(menu);
+            return iTrue;
+        }
+        if (!equal_Command(cmd, "window.resized") &&
+            !(equal_Command(cmd, "mouse.clicked") && !arg_Command(cmd)) /* ignore button release */) {
             closeMenu_Widget(menu);
         }
     }
diff --git a/src/ui/window.c b/src/ui/window.c
index a8c86e56..bdf80e52 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -229,10 +229,10 @@ static iBool handleNavBarCommands_(iWidget *navBar, const char *cmd) {
                                        isRequestOngoing_DocumentWidget(doc) ? stopCStr_ : reloadCStr_);
         }
     }
-    else if (equal_Command(cmd, "mouse.clicked")) {
+    else if (equal_Command(cmd, "mouse.clicked") && arg_Command(cmd)) {
         iWidget *widget = pointer_Command(cmd);
         iWidget *menu = findWidget_App("doctabs.menu");
-        if (isTabButton_Widget(widget)) {
+        if (isTabButton_Widget(widget) && !isVisible_Widget(menu)) {
             iWidget *tabs = findWidget_App("doctabs");
             showTabPage_Widget(tabs,
                                tabPage_Widget(tabs, childIndex_Widget(widget->parent, widget)));