From be9928beda60ef424ede00aeed667cb7ea851b7c Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mr-cheffy@users.noreply.github.com>
Date: Mon, 30 Mar 2026 17:34:32 +0200
Subject: [PATCH] no-bug: Prevent focusing the urlbar on tab switch (gh-13002)

---
 .../components/tabbrowser/content/tabbrowser-js.patch | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/browser/components/tabbrowser/content/tabbrowser-js.patch b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
index f3d858c99..f671b2632 100644
--- a/src/browser/components/tabbrowser/content/tabbrowser-js.patch
+++ b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tabbrowser.js b/browser/components/tabbrowser/content/tabbrowser.js
-index d88bc0e5570c8fd428a84fdf5af0f6bab1e2a636..d9491b680bf8839038dadc0c6ee52f81a655e998 100644
+index d88bc0e5570c8fd428a84fdf5af0f6bab1e2a636..be4bedce98f404325e547dd8a4e73e895b6025b0 100644
 --- a/browser/components/tabbrowser/content/tabbrowser.js
 +++ b/browser/components/tabbrowser/content/tabbrowser.js
 @@ -413,6 +413,7 @@
@@ -186,6 +186,15 @@ index d88bc0e5570c8fd428a84fdf5af0f6bab1e2a636..d9491b680bf8839038dadc0c6ee52f81
        // If focus is on the old tab, move it to the new tab.
        if (activeEl == oldTab) {
          newTab.focus();
+@@ -1822,7 +1902,7 @@
+       // Focus the location bar if it was previously focused for that tab.
+       // In full screen mode, only bother making the location bar visible
+       // if the tab is a blank one.
+-      if (gURLBar.getBrowserState(newBrowser).urlbarFocused) {
++      if (gURLBar.getBrowserState(newBrowser).urlbarFocused && !gZenVerticalTabsManager._hasSetSingleToolbar) {
+         let selectURL = () => {
+           if (this._asyncTabSwitching) {
+             // Set _awaitingSetURI flag to suppress popup notification
 @@ -2110,7 +2190,12 @@
        return this._setTabLabel(aTab, aLabel);
      }