diff --git a/app/src/modules/scene/controls/selectionControls/selectionControls.tsx b/app/src/modules/scene/controls/selectionControls/selectionControls.tsx
index e5b6d55..1f26a6b 100644
--- a/app/src/modules/scene/controls/selectionControls/selectionControls.tsx
+++ b/app/src/modules/scene/controls/selectionControls/selectionControls.tsx
@@ -204,10 +204,10 @@ const SelectionControls: React.FC = () => {
     }, [camera, controls, scene, toggleView, selectedAssets, copiedObjects, pastedObjects, duplicatedObjects, movedObjects, socket, rotatedObjects, activeModule, toolMode]);
 
     useEffect(() => {
-        if (activeModule !== "builder") {
+        if (activeModule !== "builder" || toolMode !== 'cursor' || toggleView) {
             clearSelection();
         }
-    }, [activeModule]);
+    }, [activeModule, toolMode, toggleView]);
 
     useFrame(() => {
         if (pastedObjects.length === 0 && duplicatedObjects.length === 0 && movedObjects.length === 0 && rotatedObjects.length === 0) {