diff --git a/app/src/modules/builder/asset/assetsGroup.tsx b/app/src/modules/builder/asset/assetsGroup.tsx
index e407d3c..04fd32b 100644
--- a/app/src/modules/builder/asset/assetsGroup.tsx
+++ b/app/src/modules/builder/asset/assetsGroup.tsx
@@ -12,7 +12,6 @@ import useModuleStore from "../../../store/useModuleStore";
 import { useThree } from "@react-three/fiber";
 import { CameraControls } from "@react-three/drei";
 import addAssetModel from "./functions/addAssetModel";
-import { useSceneContext } from "../../scene/sceneContext";
 
 const gltfLoaderWorker = new Worker(
     new URL(
@@ -23,7 +22,6 @@ const gltfLoaderWorker = new Worker(
 
 function AssetsGroup({ floorGroup, plane }: { readonly floorGroup: RefGroup, readonly plane: RefMesh }) {
     const { activeModule } = useModuleStore();
-    const { layout } = useSceneContext();
     const { socket } = useSocketStore();
     const { controls, gl, pointer, camera, raycaster } = useThree();
     const { setLoadingProgress } = useLoadingProgress();
@@ -292,9 +290,7 @@ function AssetsGroup({ floorGroup, plane }: { readonly floorGroup: RefGroup, rea
     }, [selectedItem, camera, pointer, activeModule, controls]);
 
     return (
-        <>
-            <Models />
-        </>
+        <Models />
     )
 }
 
diff --git a/app/src/modules/builder/asset/models/model/model.tsx b/app/src/modules/builder/asset/models/model/model.tsx
index 14fe258..bbe857d 100644
--- a/app/src/modules/builder/asset/models/model/model.tsx
+++ b/app/src/modules/builder/asset/models/model/model.tsx
@@ -4,7 +4,7 @@ import { retrieveGLTF, storeGLTF } from '../../../../../utils/indexDB/idbUtils';
 import { GLTF, GLTFLoader } from 'three/examples/jsm/loaders/GLTFLoader';
 import { DRACOLoader } from 'three/examples/jsm/loaders/DRACOLoader';
 import { ThreeEvent, useFrame, useThree } from '@react-three/fiber';
-import { useActiveTool, useDeletableFloorItem, useRenderDistance, useSelectedFloorItem, useSocketStore } from '../../../../../store/builder/store';
+import { useActiveTool, useDeletableFloorItem, useRenderDistance, useSelectedFloorItem, useSocketStore, useToggleView } from '../../../../../store/builder/store';
 import { AssetBoundingBox } from '../../functions/assetBoundingBox';
 import { CameraControls } from '@react-three/drei';
 import { useAssetsStore } from '../../../../../store/builder/useAssetStore';
@@ -18,6 +18,7 @@ import { useProductContext } from '../../../../simulation/products/productContex
 function Model({ asset }: { readonly asset: Asset }) {
     const { camera, controls, gl } = useThree();
     const { activeTool } = useActiveTool();
+    const { toggleView } = useToggleView();
     const { subModule } = useSubModuleStore();
     const { activeModule } = useModuleStore();
     const { removeAsset } = useAssetsStore();
@@ -249,20 +250,28 @@ function Model({ asset }: { readonly asset: Asset }) {
             visible={asset.isVisible}
             userData={asset}
             onDoubleClick={(e) => {
-                e.stopPropagation();
-                handleDblClick(asset);
+                if (!toggleView) {
+                    e.stopPropagation();
+                    handleDblClick(asset);
+                }
             }}
             onClick={(e) => {
-                e.stopPropagation();
-                handleClick(asset);
+                if (!toggleView) {
+                    e.stopPropagation();
+                    handleClick(asset);
+                }
             }}
             onPointerOver={(e) => {
-                e.stopPropagation();
-                handlePointerOver(asset);
+                if (!toggleView) {
+                    e.stopPropagation();
+                    handlePointerOver(asset);
+                }
             }}
             onPointerOut={(e) => {
-                e.stopPropagation();
-                handlePointerOut(asset);
+                if (!toggleView) {
+                    e.stopPropagation();
+                    handlePointerOut(asset);
+                }
             }}
             onContextMenu={(e) => {
                 e.stopPropagation();