diff --git a/src/zen/compact-mode/ZenCompactMode.mjs b/src/zen/compact-mode/ZenCompactMode.mjs
index efb7ccdda..be681faca 100644
--- a/src/zen/compact-mode/ZenCompactMode.mjs
+++ b/src/zen/compact-mode/ZenCompactMode.mjs
@@ -71,6 +71,7 @@ var gZenCompactModeManager = {
       // We dont want the user to be able to spam the button
       return value;
     }
+    this.sidebar.removeAttribute('zen-user-show');
     // We use this element in order to make it persis across restarts, by using the XULStore.
     // main-window can't store attributes other than window sizes, so we use this instead
     lazyCompactMode.mainAppWrapper.setAttribute('zen-compact-mode', value);
@@ -407,7 +408,7 @@ var gZenCompactModeManager = {
       const onEnter = (event) => {
         if (event.type === 'mouseenter' && !event.target.matches(':hover')) return;
         // Dont register the hover if the urlbar is floating and we are hovering over it
-        if (event.target.querySelector('#urlbar[zen-floating-urlbar]')) return;
+        if (event.target.closest('#urlbar[zen-floating-urlbar]')) return;
         this.clearFlashTimeout('has-hover' + target.id);
         window.requestAnimationFrame(() => target.setAttribute('zen-has-hover', 'true'));
       };
diff --git a/src/zen/compact-mode/zen-compact-mode.css b/src/zen/compact-mode/zen-compact-mode.css
index 19da1e3f0..4a364e050 100644
--- a/src/zen/compact-mode/zen-compact-mode.css
+++ b/src/zen/compact-mode/zen-compact-mode.css
@@ -59,7 +59,6 @@
           top: 0;
           bottom: var(--zen-element-separation);
           padding: 0 var(--zen-compact-float) !important;
-          opacity: 0;
 
           :root[zen-single-toolbar='true'] & {
             top: calc(var(--zen-element-separation) / 2);
@@ -111,7 +110,6 @@
       }
 
       #navigator-toolbox:not([animate='true']) #titlebar {
-        box-shadow: var(--zen-big-shadow);
         border-radius: calc(var(--zen-native-inner-radius) + var(--zen-element-separation) / 4);
         padding: var(--zen-toolbox-padding) !important;
         position: relative;
@@ -284,6 +282,10 @@
               right: calc(var(--zen-element-separation) / -2);
               left: auto;
             }
+
+            & #titlebar {
+              box-shadow: var(--zen-big-shadow);
+            }
           }
         }
       }