diff --git a/src/zen/compact-mode/ZenCompactMode.mjs b/src/zen/compact-mode/ZenCompactMode.mjs
index b43aa7513..206db0a0c 100644
--- a/src/zen/compact-mode/ZenCompactMode.mjs
+++ b/src/zen/compact-mode/ZenCompactMode.mjs
@@ -271,6 +271,8 @@ var gZenCompactModeManager = {
               // Subtract from the splitter width to end up with the correct element separation
               sidebarWidth += 1.5 * splitterWidth - elementSeparation;
             }
+          } else {
+            sidebarWidth -= elementSeparation;
           }
           gZenUIManager.motion
             .animate(
diff --git a/src/zen/compact-mode/zen-compact-mode.css b/src/zen/compact-mode/zen-compact-mode.css
index 059f56231..37ffa2356 100644
--- a/src/zen/compact-mode/zen-compact-mode.css
+++ b/src/zen/compact-mode/zen-compact-mode.css
@@ -64,10 +64,14 @@
           top: 0;
           bottom: var(--zen-element-separation);
           padding: 0 var(--zen-compact-float) !important;
-
+          :root[zen-single-toolbar='true'] & {
             top: calc(var(--zen-element-separation) / 2);
             height: calc(100% - var(--zen-element-separation));
-
+          }
+          :root:not([zen-single-toolbar='true']) & {
+            height: calc(100% + var(--zen-element-separation) * 2);
+            top: calc(var(--zen-element-separation) / -2);
+          }
           & #zen-sidebar-top-buttons {
             margin: 0 0 calc(var(--zen-toolbox-padding) / 2) 0;
           }
diff --git a/src/zen/tabs/zen-tabs/vertical-tabs-topbuttons-fix.css b/src/zen/tabs/zen-tabs/vertical-tabs-topbuttons-fix.css
index 51fd761be..4ebaa0bca 100644
--- a/src/zen/tabs/zen-tabs/vertical-tabs-topbuttons-fix.css
+++ b/src/zen/tabs/zen-tabs/vertical-tabs-topbuttons-fix.css
@@ -4,7 +4,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-&
+&:not([zen-compact-animating])
   #zen-sidebar-top-buttons:not(
     :has(#zen-sidebar-top-buttons-customization-target > *:not(#zen-sidebar-top-buttons-separator))
   ) {