diff --git a/src/ZenSidebarManager.mjs b/src/ZenSidebarManager.mjs
index 71f2e8e..298ca30 100644
--- a/src/ZenSidebarManager.mjs
+++ b/src/ZenSidebarManager.mjs
@@ -79,7 +79,7 @@ var gZenBrowserManagerSidebar = {
         // relative to avoid the top margin
         // 20px is the padding
         let parentRelativeHeight =
-          parent.getBoundingClientRect().height - parent.getBoundingClientRect().top + sidebar.getBoundingClientRect().top - 20;
+          parent.getBoundingClientRect().height - parent.getBoundingClientRect().top + sidebar.getBoundingClientRect().top - 30;
         let minHeight = parseInt(computedStyle.getPropertyValue('min-height').replace('px', ''));
         if (!this._isDragging) {
           // Prevent multiple resizes
diff --git a/src/ZenThemesCommon.mjs b/src/ZenThemesCommon.mjs
new file mode 100644
index 0000000..e69de29
diff --git a/src/ZenWorkspaces.mjs b/src/ZenWorkspaces.mjs
index 09ae4b1..ca3d49f 100644
--- a/src/ZenWorkspaces.mjs
+++ b/src/ZenWorkspaces.mjs
@@ -344,14 +344,14 @@ var ZenWorkspaces = {
       button.removeAttribute('hidden');
       return;
     }
-    let browserTabs = document.getElementById('tabbrowser-tabs');
+    const nextSibling = document.getElementById('zen-sidepanel-button');
     let button = document.createElement('toolbarbutton');
     button.id = 'zen-workspaces-button';
     button.className = 'toolbarbutton-1 chromeclass-toolbar-additional';
     button.setAttribute('label', 'Workspaces');
     button.setAttribute('tooltiptext', 'Workspaces');
     button.onclick = this.openWorkspacesDialog.bind(this);
-    browserTabs.insertAdjacentElement('beforebegin', button);
+    nextSibling.before(button);
   },
 
   async _updateWorkspacesButton() {