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