From 32944f1548f29c60286c77ed1874b4d9cbbe1b19 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Mon, 29 Sep 2025 10:43:22 +0200
Subject: [PATCH] fix: Fixed bookmarks not hiding when opening folders,
 b=closes #10612, c=common

---
 .../components/urlbar/UrlbarController-sys-mjs.patch        | 4 ++--
 src/zen/common/ZenUIManager.mjs                             | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/browser/components/urlbar/UrlbarController-sys-mjs.patch b/src/browser/components/urlbar/UrlbarController-sys-mjs.patch
index cd90f6116..3ebb104ae 100644
--- a/src/browser/components/urlbar/UrlbarController-sys-mjs.patch
+++ b/src/browser/components/urlbar/UrlbarController-sys-mjs.patch
@@ -1,12 +1,12 @@
 diff --git a/browser/components/urlbar/UrlbarController.sys.mjs b/browser/components/urlbar/UrlbarController.sys.mjs
-index 36e3ab4a5a153230bb488b66dda7e3e7c763ca23..81f2944b939ac0963c129f86aab0b55817349401 100644
+index 36e3ab4a5a153230bb488b66dda7e3e7c763ca23..cc4ea61914a316451fa54b01a5c8c6a305e4038a 100644
 --- a/browser/components/urlbar/UrlbarController.sys.mjs
 +++ b/browser/components/urlbar/UrlbarController.sys.mjs
 @@ -434,6 +434,8 @@ export class UrlbarController {
              });
            }
            event.preventDefault();
-+        } else {
++        } else if (!this.input.value && !(event.ctrlKey || event.altKey || event.shiftKey)) {
 +          this.browserWindow.gZenUIManager.enableCommandsMode(event);
          }
          break;
diff --git a/src/zen/common/ZenUIManager.mjs b/src/zen/common/ZenUIManager.mjs
index dc3d44ba8..c98f8fdca 100644
--- a/src/zen/common/ZenUIManager.mjs
+++ b/src/zen/common/ZenUIManager.mjs
@@ -215,8 +215,10 @@ var gZenUIManager = {
         !el.contains(showEvent.explicitOriginalTarget) ||
         (showEvent.explicitOriginalTarget instanceof Element &&
           showEvent.explicitOriginalTarget?.closest('panel')) ||
-        // See bug #7590: Ignore menupopup elements opening
-        showEvent.explicitOriginalTarget.tagName === 'menupopup'
+        // See bug #7590: Ignore menupopup elements opening.
+        // Also see #10612 for the exclusion of the zen-appcontent-navbar-wrapper
+        (showEvent.explicitOriginalTarget.tagName === 'menupopup' &&
+          el.id !== 'zen-appcontent-navbar-wrapper')
       ) {
         continue;
       }