diff --git a/src/public/javascripts/dialogs/options/appearance.js b/src/public/javascripts/dialogs/options/appearance.js
index f5272b685..0891ccfa6 100644
--- a/src/public/javascripts/dialogs/options/appearance.js
+++ b/src/public/javascripts/dialogs/options/appearance.js
@@ -82,7 +82,6 @@ export default class ApperanceOptions {
         this.$treeFontSize = $("#tree-font-size");
         this.$detailFontSize = $("#detail-font-size");
         this.$body = $("body");
-        this.$container = $("#container");
 
         this.$themeSelect.on('change', () => {
             const newTheme = this.$themeSelect.val();
diff --git a/src/public/javascripts/services/entrypoints.js b/src/public/javascripts/services/entrypoints.js
index a8f3e3a69..d53b7709c 100644
--- a/src/public/javascripts/services/entrypoints.js
+++ b/src/public/javascripts/services/entrypoints.js
@@ -114,13 +114,13 @@ export default class Entrypoints extends Component {
     toggleZenModeCommand() {
         if (!this.zenModeActive) {
             $(".hide-in-zen-mode,.gutter").addClass("hidden-by-zen-mode");
-            $("#container").addClass("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");
-            $("#container").removeClass("zen-mode");
+            $("#root-widget").removeClass("zen-mode");
             this.zenModeActive = false;
         }
     }
diff --git a/src/public/javascripts/services/protected_session.js b/src/public/javascripts/services/protected_session.js
index 1e2cba0f5..9e49de015 100644
--- a/src/public/javascripts/services/protected_session.js
+++ b/src/public/javascripts/services/protected_session.js
@@ -42,8 +42,6 @@ async function setupProtectedSession(password) {
         return;
     }
 
-    $("#container").addClass('protected-session-active');
-
     protectedSessionHolder.setProtectedSessionId(response.protectedSessionId);
     protectedSessionHolder.touchProtectedSession();
 
diff --git a/src/public/javascripts/widgets/basic_widget.js b/src/public/javascripts/widgets/basic_widget.js
index f6e03cf38..ba86a5d6e 100644
--- a/src/public/javascripts/widgets/basic_widget.js
+++ b/src/public/javascripts/widgets/basic_widget.js
@@ -31,6 +31,11 @@ class BasicWidget extends Component {
         return this;
     }
 
+    hideInZenMode() {
+        this.class('hide-in-zen-mode');
+        return this;
+    }
+
     cssBlock(block) {
         this.cssEl = block;
         return this;
diff --git a/src/public/javascripts/widgets/desktop_layout.js b/src/public/javascripts/widgets/desktop_layout.js
index 4a9192061..1df859098 100644
--- a/src/public/javascripts/widgets/desktop_layout.js
+++ b/src/public/javascripts/widgets/desktop_layout.js
@@ -105,9 +105,12 @@ export default class DesktopLayout {
                 .child(new GlobalMenuWidget())
                 .child(new TabRowWidget())
                 .child(new TitleBarButtonsWidget()))
-            .child(new StandardTopWidget())
-            .child(new FlexContainer('row').collapsible()
+            .child(new StandardTopWidget()
+                .hideInZenMode())
+            .child(new FlexContainer('row')
+                .collapsible()
                 .child(new SidePaneContainer('left')
+                    .hideInZenMode()
                     .child(new GlobalButtonsWidget())
                     .child(new SearchBoxWidget())
                     .child(new SearchResultsWidget())
@@ -116,17 +119,19 @@ export default class DesktopLayout {
                 .child(new FlexContainer('column').id('center-pane')
                     .child(new FlexContainer('row').class('title-row')
                         .cssBlock('.title-row > * { margin: 5px; }')
-                        .child(new TabCachingWidget(() => new NotePathsWidget()))
+                        .child(new TabCachingWidget(() => new NotePathsWidget()).hideInZenMode())
                         .child(new NoteTitleWidget())
-                        .child(new RunScriptButtonsWidget())
-                        .child(new ProtectedNoteSwitchWidget())
-                        .child(new NoteTypeWidget())
-                        .child(new NoteActionsWidget())
+                        .child(new RunScriptButtonsWidget().hideInZenMode())
+                        .child(new ProtectedNoteSwitchWidget().hideInZenMode())
+                        .child(new NoteTypeWidget().hideInZenMode())
+                        .child(new NoteActionsWidget().hideInZenMode())
                     )
                     .child(new TabCachingWidget(() => new PromotedAttributesWidget()))
                     .child(new TabCachingWidget(() => new NoteDetailWidget()))
                 )
-                .child(new SidePaneContainer('right').cssBlock(RIGHT_PANE_CSS)
+                .child(new SidePaneContainer('right')
+                    .cssBlock(RIGHT_PANE_CSS)
+                    .hideInZenMode()
                     .child(new NoteInfoWidget())
                     .child(new TabCachingWidget(() => new CalendarWidget()))
                     .child(new TabCachingWidget(() => new AttributesWidget()))
@@ -135,7 +140,7 @@ export default class DesktopLayout {
                     .child(new TabCachingWidget(() => new SimilarNotesWidget()))
                     .child(new TabCachingWidget(() => new WhatLinksHereWidget()))
                 )
-                .child(new SidePaneToggles())
+                .child(new SidePaneToggles().hideInZenMode())
             );
     }
 }
\ No newline at end of file