diff --git a/locales/en-US/browser/browser/zen-vertical-tabs.ftl b/locales/en-US/browser/browser/zen-vertical-tabs.ftl
index 55e88d913..1a40fa77a 100644
--- a/locales/en-US/browser/browser/zen-vertical-tabs.ftl
+++ b/locales/en-US/browser/browser/zen-vertical-tabs.ftl
@@ -3,6 +3,8 @@ zen-toolbar-context-tabs-right =
     .label = Tabs on the right
     .accesskey = R
 
+zen-toolbar-context-compact-mode =
+    .label = Compact Mode
 zen-toolbar-context-compact-mode-enable =
     .label = Enable compact mode
     .accesskey = D
diff --git a/src/zen/compact-mode/ZenCompactMode.mjs b/src/zen/compact-mode/ZenCompactMode.mjs
index 021981169..b44816e20 100644
--- a/src/zen/compact-mode/ZenCompactMode.mjs
+++ b/src/zen/compact-mode/ZenCompactMode.mjs
@@ -339,6 +339,8 @@ var gZenCompactModeManager = {
           this.getAndApplySidebarWidth({});
           this._ignoreNextResize = true;
 
+          delete this._ignoreNextHover;
+
           resolve();
           return;
         }
@@ -577,7 +579,8 @@ var gZenCompactModeManager = {
             if (
               document.documentElement.getAttribute('supress-primary-adjustment') === 'true' ||
               this._hasHoveredUrlbar ||
-              this._ignoreNextHover
+              this._ignoreNextHover ||
+              target.hasAttribute('zen-has-hover')
             ) {
               return;
             }