diff --git a/src/zen/workspaces/ZenWorkspaces.mjs b/src/zen/workspaces/ZenWorkspaces.mjs
index c5dd2bc07..24f85297e 100644
--- a/src/zen/workspaces/ZenWorkspaces.mjs
+++ b/src/zen/workspaces/ZenWorkspaces.mjs
@@ -112,6 +112,17 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
 
   selectEmptyTab(newTabTarget = null) {
     if (this._emptyTab && gZenVerticalTabsManager._canReplaceNewTab) {
+      if (gBrowser.selectedTab !== this._emptyTab) {
+        window.addEventListener(
+          'TabSelect',
+          () => {
+            setTimeout(() => {
+              gURLBar.select();
+            }, 0);
+          },
+          { once: true }
+        );
+      }
       gBrowser.selectedTab = this._emptyTab;
       return this._emptyTab;
     }