diff --git a/package-lock.json b/package-lock.json
index e38d705a3..60b4d04b1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "trilium",
-  "version": "0.47.2",
+  "version": "0.47.3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -2957,9 +2957,9 @@
       }
     },
     "electron": {
-      "version": "13.0.0-beta.26",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-13.0.0-beta.26.tgz",
-      "integrity": "sha512-glDAQjSzV26JvmB9pbdd1dLkjqUvBv9X0B8FrRvIK0BAhEmMzzZ3gKD6VPsxg2omDYMI35oThQ+92D4RxRcb+g==",
+      "version": "13.0.0-beta.27",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-13.0.0-beta.27.tgz",
+      "integrity": "sha512-Co5143QQBiUHLY8qKPbe4axGnFxFLIPbdBuKh0pMvhmsGsVbTK3mEihmhl/lBKQe36cu+gnODpvtZZ0uGsqlxA==",
       "dev": true,
       "requires": {
         "@electron/get": "^1.0.1",
diff --git a/src/public/app/services/entrypoints.js b/src/public/app/services/entrypoints.js
index 08f4747c8..ffaf2e9e3 100644
--- a/src/public/app/services/entrypoints.js
+++ b/src/public/app/services/entrypoints.js
@@ -128,20 +128,6 @@ export default class Entrypoints extends Component {
         }
     }
 
-    toggleZenModeCommand() {
-        if (!this.zenModeActive) {
-            $(".hide-in-zen-mode,.gutter").addClass("hidden-by-zen-mode");
-            $("#root-widget").addClass("zen-mode");
-            this.zenModeActive = true;
-        }
-        else {
-            // not hiding / showing explicitly since element might be hidden also for other reasons
-            $(".hide-in-zen-mode,.gutter").removeClass("hidden-by-zen-mode");
-            $("#root-widget").removeClass("zen-mode");
-            this.zenModeActive = false;
-        }
-    }
-
     reloadFrontendAppCommand() {
         utils.reloadApp();
     }
diff --git a/src/public/app/widgets/containers/root_container.js b/src/public/app/widgets/containers/root_container.js
index aecc8f2c3..82f64a939 100644
--- a/src/public/app/widgets/containers/root_container.js
+++ b/src/public/app/widgets/containers/root_container.js
@@ -22,6 +22,23 @@ export default class RootContainer extends FlexContainer {
 
             this.$widget.toggleClass("protected", note.isProtected);
         }
+
+        this.setZenMode(this.isZenModeActive);
+    }
+
+    setZenMode(active) {
+        this.isZenModeActive = active;
+
+        if (this.isZenModeActive) {
+            $("#root-widget").addClass("zen-mode");
+        }
+        else {
+            $("#root-widget").removeClass("zen-mode");
+        }
+    }
+
+    toggleZenModeEvent() {
+        this.setZenMode(!this.isZenModeActive);
     }
 
     tabNoteSwitchedEvent() {
diff --git a/src/public/stylesheets/style.css b/src/public/stylesheets/style.css
index f4e3a4706..09a28c4c1 100644
--- a/src/public/stylesheets/style.css
+++ b/src/public/stylesheets/style.css
@@ -103,26 +103,6 @@ span.fancytree-node.muted { opacity: 0.6; }
     display: none;
 }
 
-.note-tab-content-template {
-    display: none !important;
-}
-
-.note-tab-content {
-    display: flex;
-    flex-direction: row;
-    height: 100%;
-    width: 100%;
-}
-
-/** we disable shield background when in zen mode because I couldn't get it to stay static
-    (it kept growing with content) */
-#root-widget:not(.zen-mode) .note-tab-content.protected {
-    /* DON'T COLLAPSE THE RULES INTO SINGLE ONE, BACKGROUND WON'T DISPLAY */
-    background: url('../images/shield.svg') no-repeat;
-    background-size: contain;
-    background-position: center;
-}
-
 .zen-mode #center-pane {
     width: 100% !important;
     /* limit max width to improve readability */
@@ -131,6 +111,10 @@ span.fancytree-node.muted { opacity: 0.6; }
     margin-right: auto;
 }
 
+.zen-mode .hide-in-zen-mode, .zen-mode .gutter {
+    display: none !important;
+}
+
 .ui-autocomplete {
     max-height: 300px;
     overflow-y: auto;
@@ -775,10 +759,6 @@ body {
     font-size: var(--main-font-size);
 }
 
-.hidden-by-zen-mode {
-    display: none !important;
-}
-
 .gutter {
     background: linear-gradient(to bottom, transparent, var(--accented-background-color), transparent);
 }
diff --git a/src/services/build.js b/src/services/build.js
index f304c7fce..66897a31a 100644
--- a/src/services/build.js
+++ b/src/services/build.js
@@ -1 +1 @@
-module.exports = { buildDate:"2021-04-26T22:32:54+02:00", buildRevision: "6f1b0b92fe8dcea736c15217c69512c7fee769cb" };
+module.exports = { buildDate:"2021-05-15T23:05:20+02:00", buildRevision: "f6dd1110e842a8b84f2bbdaadad315763045c152" };