diff --git a/packages/editor/src/components/editor/selection-manager.tsx b/packages/editor/src/components/editor/selection-manager.tsx
index 81a6059c..0d2c0291 100644
--- a/packages/editor/src/components/editor/selection-manager.tsx
+++ b/packages/editor/src/components/editor/selection-manager.tsx
@@ -576,6 +576,7 @@ const SELECTION_STRATEGIES: Record<string, SelectionStrategy> = {
       'roof-segment',
       'stair',
       'stair-segment',
+      'shelf',
       'spawn',
       'window',
       'door',
@@ -1012,6 +1013,7 @@ export const SelectionManager = () => {
       'roof-segment',
       'stair',
       'stair-segment',
+      'shelf',
       'window',
       'door',
       'zone',
@@ -1183,6 +1185,7 @@ export const SelectionManager = () => {
       'roof-segment',
       'stair',
       'stair-segment',
+      'shelf',
       'spawn',
       'window',
       'door',
@@ -1334,6 +1337,7 @@ export const SelectionManager = () => {
       'roof-segment',
       'stair',
       'stair-segment',
+      'shelf',
       'spawn',
       'window',
       'door',
@@ -1408,6 +1412,7 @@ export const SelectionManager = () => {
       'roof-segment',
       'stair',
       'stair-segment',
+      'shelf',
       'spawn',
       'window',
       'door',
diff --git a/packages/viewer/src/components/viewer/selection-manager.tsx b/packages/viewer/src/components/viewer/selection-manager.tsx
index 9f7adadf..b465b3f6 100644
--- a/packages/viewer/src/components/viewer/selection-manager.tsx
+++ b/packages/viewer/src/components/viewer/selection-manager.tsx
@@ -35,6 +35,7 @@ type SelectableNodeType =
   | 'door'
   | 'column'
   | 'item'
+  | 'shelf'
   | 'slab'
   | 'ceiling'
   | 'roof'
@@ -338,6 +339,7 @@ export const SelectionManager = () => {
       'fence',
       'item',
       'column',
+      'shelf',
       'slab',
       'ceiling',
       'roof',