diff --git a/packages/desktop/app/stylesheets/renderer.css b/packages/desktop/app/stylesheets/renderer.css
index 152277ef4..3a920a12b 100644
--- a/packages/desktop/app/stylesheets/renderer.css
+++ b/packages/desktop/app/stylesheets/renderer.css
@@ -77,6 +77,10 @@
   -webkit-app-region: drag;
 }
 
+.mac-desktop.focus-mode #editor-title-bar {
+  -webkit-app-region: no-drag;
+}
+
 .mac-desktop [data-dialog-portal]:has([data-dialog])::after {
   content: '';
   position: absolute;
diff --git a/packages/web/src/stylesheets/_focused.scss b/packages/web/src/stylesheets/_focused.scss
index aed06d282..ca0b8514e 100644
--- a/packages/web/src/stylesheets/_focused.scss
+++ b/packages/web/src/stylesheets/_focused.scss
@@ -41,11 +41,18 @@
         display: none;
       }
 
-      #editor-title-bar:hover {
+      #editor-title-bar:hover,
+      #editor-title-bar:has(:focus) {
         .note-view-linking-container,
         #toggle-linking-container {
           display: flex;
         }
+
+        .note-view-options-buttons,
+        .note-status-tooltip-container,
+        #conflict-resolution-button {
+          opacity: 1;
+        }
       }
 
       .note-view-options-buttons,
@@ -53,14 +60,6 @@
       #conflict-resolution-button {
         opacity: 0;
       }
-
-      #editor-title-bar:hover {
-        .note-view-options-buttons,
-        .note-status-tooltip-container,
-        #conflict-resolution-button {
-          opacity: 1;
-        }
-      }
     }
 
     #editor-menu-bar {