diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/tray.js b/packages/node_modules/@node-red/editor-client/src/js/ui/tray.js
index b7e2325c5..1b331fb9a 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/tray.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/tray.js
@@ -260,6 +260,9 @@
                     showTray(options);
                 },250)
             } else {
+                if (stack.length > 0) {
+                    stack[stack.length-1].tray.css("z-index", 0);
+                }
                 RED.events.emit("editor:open");
                 showTray(options);
             }
@@ -301,7 +304,7 @@
                                 oldTray.tray.css({right:0});
                                 if (oldTray.options.show) {
                                     raiseTrayZ();
-                                    handleWindowResize();//cause call to monaco layout 
+                                    handleWindowResize();//cause call to monaco layout
                                     oldTray.options.show();
                                 }
                             },0);
@@ -322,6 +325,8 @@
                         $(".red-ui-sidebar-shade").hide();
                         RED.events.emit("editor:close");
                         RED.view.focus();
+                    } else {
+                        stack[stack.length-1].tray.css("z-index", "auto");
                     }
                 },250)
             }