diff --git a/packages/editor/src/components/editor/floorplan-panel.tsx b/packages/editor/src/components/editor/floorplan-panel.tsx
index f7318707..2c12132b 100644
--- a/packages/editor/src/components/editor/floorplan-panel.tsx
+++ b/packages/editor/src/components/editor/floorplan-panel.tsx
@@ -5664,7 +5664,7 @@ export function FloorplanPanel() {
   }, [fittedViewport, levelId])
 
   useEffect(() => {
-    if (!(phase === 'site' && levelNode?.type === 'level' && levelNode.level > 0)) {
+    if (!(phase === 'site' && levelNode?.type === 'level')) {
       return
     }
 
diff --git a/packages/editor/src/components/editor/selection-manager.tsx b/packages/editor/src/components/editor/selection-manager.tsx
index af806bda..18dbcf35 100755
--- a/packages/editor/src/components/editor/selection-manager.tsx
+++ b/packages/editor/src/components/editor/selection-manager.tsx
@@ -389,7 +389,8 @@ export const SelectionManager = () => {
       let currentStructureLayer = useEditor.getState().structureLayer
 
       // Auto-switch between zones, structure, and furnish when clicking elements on the same level.
-      if (currentPhase === 'structure' || currentPhase === 'furnish') {
+      // Also auto-switch from site phase when clicking structural/furnish elements (e.g. 2D floorplan).
+      if (currentPhase === 'structure' || currentPhase === 'furnish' || currentPhase === 'site') {
         if (isNodeInCurrentLevel(node)) {
           const target = getSelectionTarget(node)
           if (target) {