diff --git a/packages/node_modules/@node-red/editor-client/src/js/red.js b/packages/node_modules/@node-red/editor-client/src/js/red.js
index bbdf41765..985595200 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/red.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/red.js
@@ -671,7 +671,7 @@ var RED = (function() {
 
         loader.end();
 
-        $(".red-ui-header-toolbar").removeClass('hide');
+        $("#red-ui-header-toolbar").removeClass('hide');
         RED.sidebar.show(":first", true);
 
         setTimeout(function() {
@@ -906,8 +906,7 @@ var RED = (function() {
         const logoContainer = $('<div id="red-ui-header-logo"></div>').appendTo(header);
         let logo = $('<span class="red-ui-header-logo"></span>').appendTo(logoContainer);
         $('<div id="red-ui-header-tabs" class="hide"></div>').appendTo(header);
-        $('<ul class="red-ui-header-toolbar hide"></ul>').appendTo(header);
-        $('<div id="red-ui-header-shade" class="hide"></div>').appendTo(header);
+        $('<div id="red-ui-header-toolbar" class="hide"><div id="red-ui-header-shade" class="hide"></div><ul class="red-ui-header-toolbar"></ul></div>').appendTo(header);
         $('<div id="red-ui-main-container">'+
             '<div id="red-ui-sidebar-left"></div>'+
             '<div id="red-ui-workspace"></div>'+
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/sidebar.js b/packages/node_modules/@node-red/editor-client/src/js/ui/sidebar.js
index 85404a51b..e97ce8ffc 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/sidebar.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/sidebar.js
@@ -169,6 +169,9 @@ RED.sidebar = (function() {
 
         if (options.toolbar) {
             targetSidebar.sections[targetSection].footer.append(options.toolbar);
+            if (!options.enableOnEdit) {
+                $('<div>',{class:"red-ui-sidebar-shade hide"}).appendTo(options.toolbar);
+            }
             $(options.toolbar).hide();
         }
         var id = options.id;
@@ -697,8 +700,8 @@ RED.sidebar = (function() {
         const sidebarHeight = $("#red-ui-main-container").height();
         sidebar.container.addClass("red-ui-sidebar").addClass('red-ui-sidebar-' + sidebar.direction);
         sidebar.container.width(sidebar.defaultWidth);
-        if (sidebar.direction === 'right') {
-            $('<div>',{class:"red-ui-sidebar-shade hide"}).css("z-index", 0).appendTo(sidebar.container);
+        if (sidebar.direction === 'left') {
+            // $('<div>',{class:"red-ui-sidebar-shade hide"}).css("z-index", 0).appendTo(sidebar.container);
         }
         sidebar.sections = {};
         sidebar.sections.top = {}
diff --git a/packages/node_modules/@node-red/editor-client/src/sass/base.scss b/packages/node_modules/@node-red/editor-client/src/sass/base.scss
index 552c2d9ae..9cb10dfda 100644
--- a/packages/node_modules/@node-red/editor-client/src/sass/base.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/base.scss
@@ -52,6 +52,11 @@ html, body {
     @include mixins.shade;
     z-index: 5;
 }
+#red-ui-header-shade, .red-ui-sidebar-shade {
+    background-color: transparent;
+    cursor: not-allowed;
+}
+
 #red-ui-full-shade {
     @include mixins.shade;
     z-index: 15;
diff --git a/packages/node_modules/@node-red/editor-client/src/sass/colors.scss b/packages/node_modules/@node-red/editor-client/src/sass/colors.scss
index 029e5745a..6be0221b9 100644
--- a/packages/node_modules/@node-red/editor-client/src/sass/colors.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/colors.scss
@@ -137,7 +137,7 @@ $workspace-button-background-primary: #bb0000;
 $workspace-button-background-primary-hover: #920f0f;
 $workspace-button-color-focus-outline: $form-input-focus-color;
 
-$shade-color: rgba(0,0,0,0.05);
+$shade-color: rgba(255,0,0,0.06);
 
 $popover-background: #333;
 $popover-border: $popover-background;
diff --git a/packages/node_modules/@node-red/editor-client/src/sass/header.scss b/packages/node_modules/@node-red/editor-client/src/sass/header.scss
index 1aff99a9b..75b82901b 100644
--- a/packages/node_modules/@node-red/editor-client/src/sass/header.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/header.scss
@@ -67,10 +67,8 @@
     }
 
     .red-ui-header-toolbar {
-        flex: 1 0 auto;
-        &:not(.hide) {
-            display: flex;
-        }
+        display: flex;
+        flex:1 0 auto;
         align-items: stretch;
         padding: 0;
         margin: 0 10px 0 20px;
@@ -311,6 +309,15 @@
         color: var(--red-ui-header-menu-heading-color);
     }
 }
+#red-ui-header-toolbar {
+    display: flex;
+    position: relative;
+    align-items: center;
+    flex: 1 0 auto;
+    &:not(.hide) {
+        display: flex;
+    }
+}
 
 #red-ui-header-button-user {
     background-color: var(--red-ui-header-background);
diff --git a/packages/node_modules/@node-red/editor-client/src/sass/sidebar.scss b/packages/node_modules/@node-red/editor-client/src/sass/sidebar.scss
index 20aa63785..939b0eca6 100644
--- a/packages/node_modules/@node-red/editor-client/src/sass/sidebar.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/sidebar.scss
@@ -112,7 +112,8 @@
         left: -6px;
         width: 12px;
         height: calc(100% - 40px);;
-        z-index: 20;
+        // Below the full-screen shade
+        z-index: 14;
     }
 }