diff --git a/app/src/modules/builder/asset/models/model/model.tsx b/app/src/modules/builder/asset/models/model/model.tsx
index 75ad55b..ff28363 100644
--- a/app/src/modules/builder/asset/models/model/model.tsx
+++ b/app/src/modules/builder/asset/models/model/model.tsx
@@ -73,11 +73,17 @@ function Model({ asset }: { readonly asset: Asset }) {
 
     useEffect(() => {
         setDeletableFloorItem(null);
-        if (selectedFloorItem === null || selectedFloorItem.modelUuid !== asset.modelUuid) {
+        if (selectedFloorItem === null || selectedFloorItem.userData.modelUuid !== asset.modelUuid) {
             resetAnimation(asset.modelUuid);
         }
     }, [activeModule, toolMode, selectedFloorItem])
 
+    useEffect(() => {
+        if (selectedFloorItem && selectedFloorItem.userData.modelUuid === asset.modelUuid) {
+            setSelectedFloorItem(groupRef.current);
+        }
+    }, [isRendered, selectedFloorItem])
+
     useEffect(() => {
         const loader = new GLTFLoader();
         const dracoLoader = new DRACOLoader();