diff --git a/src/components/three/ModelViewer.tsx b/src/components/three/ModelViewer.tsx
index 3db3b0b..bb9074d 100644
--- a/src/components/three/ModelViewer.tsx
+++ b/src/components/three/ModelViewer.tsx
@@ -1022,6 +1022,8 @@ export function ModelViewerCanvas({ url }: ModelViewerProps) {
       <GridAutoFollower />
 
       <PositionDragHandler />
+      <SelectionHandler />
+      <VisibilityApplier />
 
       <OrbitControls
         makeDefault
@@ -1029,8 +1031,9 @@ export function ModelViewerCanvas({ url }: ModelViewerProps) {
         dampingFactor={0.1}
         minDistance={0.05}
         maxDistance={50}
-        enabled={!positionMode}
+        enabled={!positionMode && !useModelStore.getState().selectionMode}
       />
+
     </Canvas>
   );
 }