diff --git a/app/src/modules/builder/Decal/decalInstance.tsx b/app/src/modules/builder/Decal/decalInstance.tsx
index 71dcd83..fa8be89 100644
--- a/app/src/modules/builder/Decal/decalInstance.tsx
+++ b/app/src/modules/builder/Decal/decalInstance.tsx
@@ -21,9 +21,10 @@ function DecalInstance({ visible = true, decal }: { visible?: boolean, decal: De
             rotation={[0, 0, decal.decalRotation]}
             scale={[decal.decalScale, decal.decalScale, 0.01]}
             userData={decal}
-            onClick={(e) => {
+            onDoubleClick={(e) => {
                 if (visible && !togglView && activeModule === 'builder') {
                     if (e.object.userData.decalUuid) {
+                        e.stopPropagation();
                         setSelectedDecal(e.object);
                         setSelectedWall(null);
                         setSelectedFloor(null);
diff --git a/app/src/modules/builder/floor/Instances/Instance/floorInstance.tsx b/app/src/modules/builder/floor/Instances/Instance/floorInstance.tsx
index e5ed733..c6c8139 100644
--- a/app/src/modules/builder/floor/Instances/Instance/floorInstance.tsx
+++ b/app/src/modules/builder/floor/Instances/Instance/floorInstance.tsx
@@ -59,11 +59,12 @@ function FloorInstance({ floor }: { floor: Floor }) {
             receiveShadow
             name={`Floor-${floor.floorUuid}`}
             rotation={[Math.PI / 2, 0, 0]}
-            position={[0, !floor.isBeveled ? floor.floorDepth : (floor.floorDepth - 0.1), 0]}
+            position={[0, !floor.isBeveled ? (floor.floorDepth - 0.1) : (floor.floorDepth - 0.2), 0]}
             userData={floor}
             onDoubleClick={(e) => {
                 if (!togglView && activeModule === 'builder') {
                     if (e.object.userData.floorUuid) {
+                        e.stopPropagation();
                         setSelectedFloor(e.object);
                         setSelectedDecal(null);
                     }
diff --git a/app/src/modules/builder/wall/Instances/instance/wall.tsx b/app/src/modules/builder/wall/Instances/instance/wall.tsx
index ff0e5ce..0498b5b 100644
--- a/app/src/modules/builder/wall/Instances/instance/wall.tsx
+++ b/app/src/modules/builder/wall/Instances/instance/wall.tsx
@@ -126,6 +126,7 @@ function Wall({ wall }: { readonly wall: Wall }) {
                 onDoubleClick={(e) => {
                     if (visible && !togglView && activeModule === 'builder') {
                         if (e.object.userData.wallUuid) {
+                            e.stopPropagation();
                             setSelectedWall(e.object);
                             setSelectedDecal(null);