diff --git a/src/public/app/widgets/close_zen_button.ts b/src/public/app/widgets/close_zen_button.ts
index 035104ebe..8662aa1da 100644
--- a/src/public/app/widgets/close_zen_button.ts
+++ b/src/public/app/widgets/close_zen_button.ts
@@ -2,13 +2,16 @@ import BasicWidget from "./basic_widget.js";
 
 const TPL = `\
 <div class="close-zen-container">
-    <a class="button-widget bx icon-action bxs-yin-yang"
+    <button class="button-widget bx icon-action bxs-yin-yang"
         data-trigger-command="toggleZenMode" />
 
     <style>
+    :root {
+        --zen-button-size: 32px;
+    }
+
     .close-zen-container {
         display: none;
-        --size: 32px;
         width: var(--size);
         height: var(--size);
     }
@@ -19,6 +22,7 @@ const TPL = `\
         top: 0;
         right: 0;
         z-index: 9999;
+        -webkit-app-region: no-drag;
     }
 
     body.zen.electron:not(.native-titlebar) .close-zen-container {
diff --git a/src/public/stylesheets/style.css b/src/public/stylesheets/style.css
index 3e5d78899..53fb6f197 100644
--- a/src/public/stylesheets/style.css
+++ b/src/public/stylesheets/style.css
@@ -1671,4 +1671,16 @@ body.zen #launcher-pane {
     height: 64px !important;
     background: transparent !important;
     border: 0 !important;
+}
+
+body.zen .title-row {
+    display: block !important;
+    height: unset !important;
+    -webkit-app-region: drag;
+}
+
+body.zen .note-title-widget,
+body.zen .note-title-widget input {
+    font-size: 1rem !important;
+    background: transparent !important;
 }
\ No newline at end of file