Context menu behavior improvements

1 files changed, 2 insertions, 2 deletions

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)));