diff --git a/editor/src/components/editor/canvas-toolbar-states.tsx b/editor/src/components/editor/canvas-toolbar-states.tsx
index 0bb4aa42da038..01121a6249675 100644
--- a/editor/src/components/editor/canvas-toolbar-states.tsx
+++ b/editor/src/components/editor/canvas-toolbar-states.tsx
@@ -125,6 +125,10 @@ export function useToolbarMode(): ToolbarMode {
     }
   }
 
+  if (editorMode.type === 'panels') {
+    return { primary: 'panels' }
+  }
+
   // Edit Mode
   if (nothingSelected) {
     return { primary: 'edit', secondary: 'nothing-selected' }
@@ -138,10 +142,6 @@ export function useToolbarMode(): ToolbarMode {
     return { primary: 'edit', secondary: 'selected' }
   }
 
-  if (editorMode.type === 'panels') {
-    return { primary: 'panels' }
-  }
-
   return { primary: 'edit', secondary: 'nothing-selected' } // fallback - for now
 }