diff --git a/src/browser/base/zen-components/ZenPinnedTabManager.mjs b/src/browser/base/zen-components/ZenPinnedTabManager.mjs
index 5f69ab10b..aa2f9213d 100644
--- a/src/browser/base/zen-components/ZenPinnedTabManager.mjs
+++ b/src/browser/base/zen-components/ZenPinnedTabManager.mjs
@@ -647,7 +647,8 @@
     }
 
     moveToAnotherTabContainerIfNecessary(event, draggedTab) {
-      const pinnedTabsTarget = event.target.closest('#vertical-pinned-tabs-container');
+      const pinnedTabsTarget =
+        event.target.closest('#vertical-pinned-tabs-container') || event.target.closest('#zen-current-workspace-indicator');
       const essentialTabsTarget = event.target.closest('#zen-essentials-container');
       const tabsTarget = event.target.closest('#tabbrowser-arrowscrollbox');
 
@@ -716,6 +717,7 @@
     removeTabContainersDragoverClass() {
       this.dragIndicator.remove();
       this._dragIndicator = null;
+      document.getElementById('zen-current-workspace-indicator').removeAttribute('open');
     }
 
     get dragIndicator() {
@@ -736,6 +738,12 @@
       const essentialTabsTarget = event.target.closest('#zen-essentials-container');
       const tabsTarget = event.target.closest('#tabbrowser-arrowscrollbox');
       const targetTab = event.target.closest('.tabbrowser-tab');
+      if (event.target.closest('#zen-current-workspace-indicator')) {
+        this.removeTabContainersDragoverClass();
+        event.target.setAttribute('open', true);
+      } else {
+        document.getElementById('zen-current-workspace-indicator').removeAttribute('open');
+      }
 
       // If there's no valid target tab, nothing to do
       if (!targetTab) {
diff --git a/src/browser/components/urlbar/UrlbarInput-sys-mjs.patch b/src/browser/components/urlbar/UrlbarInput-sys-mjs.patch
index 6dce5abbc..4f76c0d50 100644
--- a/src/browser/components/urlbar/UrlbarInput-sys-mjs.patch
+++ b/src/browser/components/urlbar/UrlbarInput-sys-mjs.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/urlbar/UrlbarInput.sys.mjs b/browser/components/urlbar/UrlbarInput.sys.mjs
-index 50968dc04b527438acf30151f0c2e92f8b45097c..0d4c899a8a0d98d6cac41ecdd1c40df52bd050be 100644
+index 50968dc04b527438acf30151f0c2e92f8b45097c..2948efd18fb1ee609695acd5b5b0211ce209ff1a 100644
 --- a/browser/components/urlbar/UrlbarInput.sys.mjs
 +++ b/browser/components/urlbar/UrlbarInput.sys.mjs
 @@ -67,6 +67,13 @@ XPCOMUtils.defineLazyPreferenceGetter(
@@ -24,7 +24,7 @@ index 50968dc04b527438acf30151f0c2e92f8b45097c..0d4c899a8a0d98d6cac41ecdd1c40df5
      this.inputField.select();
 +    this.document.ownerGlobal.setTimeout(() => {
 +      this.document.getElementById("navigator-toolbox").removeAttribute("supress-primary-adjustment");
-+    }, 0);
++    }, 100);
      this._suppressPrimaryAdjustment = false;
    }
  
diff --git a/src/browser/themes/shared/zen-icons/expand-sidebar.svg b/src/browser/themes/shared/zen-icons/expand-sidebar.svg
new file mode 100644
index 000000000..a72ec63ba
--- /dev/null
+++ b/src/browser/themes/shared/zen-icons/expand-sidebar.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><line x1="6.25" y1="12.5" x2="6.25" y2="15.25" data-color="color-2"></line><line x1="6.25" y1="2.75" x2="6.25" y2="5.5" data-color="color-2"></line><polyline points="8.75 6.5 6.25 9 8.75 11.5" data-color="color-2"></polyline><line x1="6.25" y1="9" x2="12.75" y2="9" data-color="color-2"></line><rect x="1.75" y="2.75" width="14.5" height="12.5" rx="2" ry="2" transform="translate(18 18) rotate(180)"></rect></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/icons.css b/src/browser/themes/shared/zen-icons/icons.css
index f41e7abd0..1f9c726d7 100644
--- a/src/browser/themes/shared/zen-icons/icons.css
+++ b/src/browser/themes/shared/zen-icons/icons.css
@@ -390,7 +390,7 @@
 }
 
 #zen-expand-sidebar-button {
-  list-style-image: url('sidebar.svg') !important;
+  list-style-image: url('expand-sidebar.svg') !important;
 }
 
 .panel-header > .subviewbutton-back {
diff --git a/src/browser/themes/shared/zen-icons/jar.inc.mn b/src/browser/themes/shared/zen-icons/jar.inc.mn
index 62141b541..ba6f17c2c 100644
--- a/src/browser/themes/shared/zen-icons/jar.inc.mn
+++ b/src/browser/themes/shared/zen-icons/jar.inc.mn
@@ -39,6 +39,7 @@
   skin/classic/browser/zen-icons/edit.svg                      (../shared/zen-icons/edit.svg) 
   skin/classic/browser/zen-icons/essential-add.svg                      (../shared/zen-icons/essential-add.svg) 
   skin/classic/browser/zen-icons/essential-remove.svg                      (../shared/zen-icons/essential-remove.svg) 
+  skin/classic/browser/zen-icons/expand-sidebar.svg                      (../shared/zen-icons/expand-sidebar.svg) 
   skin/classic/browser/zen-icons/ext-link.svg                      (../shared/zen-icons/ext-link.svg) 
   skin/classic/browser/zen-icons/extension-blocked.svg                      (../shared/zen-icons/extension-blocked.svg) 
   skin/classic/browser/zen-icons/extension.svg                      (../shared/zen-icons/extension.svg)