diff --git a/src/browser/base/content/browser-fullScreenAndPointerLock-js.patch b/src/browser/base/content/browser-fullScreenAndPointerLock-js.patch
index ce5b0041f2..b8b48d9546 100644
--- a/src/browser/base/content/browser-fullScreenAndPointerLock-js.patch
+++ b/src/browser/base/content/browser-fullScreenAndPointerLock-js.patch
@@ -2,18 +2,18 @@ diff --git a/browser/base/content/browser-fullScreenAndPointerLock.js b/browser/
 index bef746dc594ad974c91075cf3657c199f8f8830f..bb671341b6715c42df76f7298ba55e1fac73f33b 100644
 --- a/browser/base/content/browser-fullScreenAndPointerLock.js
 +++ b/browser/base/content/browser-fullScreenAndPointerLock.js
-@@ -424,10 +424,10 @@ var FullScreen = {
+@@ -423,10 +423,10 @@ var FullScreen = {
+     shiftSize = shiftSize.toFixed(2);
      gNavToolbox.classList.toggle("fullscreen-with-menubar", shiftSize > 0);
  
-     let transform = shiftSize > 0 ? `translateY(${shiftSize}px)` : "";
+-    let transform = shiftSize > 0 ? `translateY(${shiftSize}px)` : "";
 -    gNavToolbox.style.transform = transform;
 -    gURLBar.textbox.style.transform = gURLBar.textbox.hasAttribute("breakout")
 -      ? transform
--      : "";
-+    //gNavToolbox.style.transform = transform;
-+    //gURLBar.textbox.style.transform = gURLBar.textbox.hasAttribute("breakout")
-+    //  ? transform
-+    //  : "";
++    const padding = shiftSize > 0 ? `${shiftSize}px` : "";
++    const appContentNavbarWrapper = document.getElementById('zen-appcontent-navbar-wrapper');
++    appContentNavbarWrapper.style.paddingTop = gURLBar.textbox.hasAttribute("breakout")
++      ? padding
+       : "";
      if (shiftSize > 0) {
        // If the mouse tracking missed our fullScreenToggler, then the toolbox
-       // might not have been shown before the menubar is animated down. Make
diff --git a/src/zen/compact-mode/ZenCompactMode.mjs b/src/zen/compact-mode/ZenCompactMode.mjs
index f5f54fe053..2c648977fe 100644
--- a/src/zen/compact-mode/ZenCompactMode.mjs
+++ b/src/zen/compact-mode/ZenCompactMode.mjs
@@ -715,6 +715,15 @@ window.gZenCompactModeManager = {
           if (event.target.matches(':hover')) {
             return;
           }
+          if (AppConstants.platform == 'macosx' && FullScreen._currentToolbarShift > 0) {
+            this.flashElement(
+              target,
+              this.hideAfterHoverDuration,
+              'has-hover' + target.id,
+              'zen-has-hover'
+            );
+            return;
+          }
 
           if (
             event.explicitOriginalTarget?.closest?.('#urlbar[zen-floating-urlbar]') ||
@@ -764,12 +773,20 @@ window.gZenCompactModeManager = {
           }
           window.cancelAnimationFrame(this._removeHoverFrames[target.id]);
 
-          this.flashElement(
-            target,
-            this.hideAfterHoverDuration,
-            'has-hover' + target.id,
-            'zen-has-hover'
-          );
+          if (
+            AppConstants.platform == 'macosx' &&
+            window.fullScreen &&
+            entry.screenEdge === 'top'
+          ) {
+            target.setAttribute('zen-has-hover', 'true');
+          } else {
+            this.flashElement(
+              target,
+              this.hideAfterHoverDuration,
+              'has-hover' + target.id,
+              'zen-has-hover'
+            );
+          }
           document.addEventListener(
             'mousemove',
             () => {