diff --git a/packages/eez-studio-ui/_stylesheets/project-editor.less b/packages/eez-studio-ui/_stylesheets/project-editor.less
index 37c240f6..1e54672e 100644
--- a/packages/eez-studio-ui/_stylesheets/project-editor.less
+++ b/packages/eez-studio-ui/_stylesheets/project-editor.less
@@ -93,6 +93,8 @@
 
         .EezStudio_ProjectEditor_ToolbarNav_RunEditSwitchControls {
             display: flex;
+            z-index: 1;
+            background-color: @panelHeaderColor;
         }
 
         .EezStudio_ProjectEditor_ToolbarNav_FlowRuntimeControls {