diff --git a/src/public/app/widgets/buttons/global_menu.ts b/src/public/app/widgets/buttons/global_menu.ts
index 140d418d6..143f339bd 100644
--- a/src/public/app/widgets/buttons/global_menu.ts
+++ b/src/public/app/widgets/buttons/global_menu.ts
@@ -137,6 +137,7 @@ const TPL = `
         <li class="dropdown-item" data-trigger-command="toggleZenMode">
             <span class="bx bxs-yin-yang"></span>
             ${t("global_menu.toggle-zen-mode")}
+            <kbd data-command="toggleZenMode"></kbd>
         </li>
 
         <div class="dropdown-divider"></div>
diff --git a/src/public/app/widgets/close_zen_button.ts b/src/public/app/widgets/close_zen_button.ts
index 138fa6ed6..27e64183d 100644
--- a/src/public/app/widgets/close_zen_button.ts
+++ b/src/public/app/widgets/close_zen_button.ts
@@ -1,9 +1,12 @@
 import BasicWidget from "./basic_widget.js";
+import { t } from "../services/i18n.js";
 
 const TPL = `\
 <div class="close-zen-container">
     <button class="button-widget bx icon-action bxs-yin-yang"
-        data-trigger-command="toggleZenMode" />
+        data-trigger-command="toggleZenMode"
+        title="${t("zen_mode.button_exit")}"
+    />
 
     <style>
     :root {
diff --git a/src/public/translations/en/translation.json b/src/public/translations/en/translation.json
index 9e7cd6454..4c0220d9c 100644
--- a/src/public/translations/en/translation.json
+++ b/src/public/translations/en/translation.json
@@ -645,6 +645,9 @@
     "show-cheatsheet": "Show Cheatsheet",
     "toggle-zen-mode": "Zen Mode"
   },
+  "zen_mode": {
+    "button_exit": "Exit Zen Mode"
+  },
   "sync_status": {
     "unknown": "<p>Sync status will be known once the next sync attempt starts.</p><p>Click to trigger sync now.</p>",
     "connected_with_changes": "<p>Connected to the sync server. <br>There are some outstanding changes yet to be synced.</p><p>Click to trigger sync.</p>",