diff --git a/apps/editor/components/ui/sidebar/panels/site-panel/references-dialog.tsx b/apps/editor/components/ui/sidebar/panels/site-panel/references-dialog.tsx
index 245fb06d..033bce12 100644
--- a/apps/editor/components/ui/sidebar/panels/site-panel/references-dialog.tsx
+++ b/apps/editor/components/ui/sidebar/panels/site-panel/references-dialog.tsx
@@ -59,8 +59,11 @@ export function ReferencesDialog({ levelId, open, onOpenChange }: ReferencesDial
       })
       createNode(node, levelId as AnyNodeId)
       e.target.value = ''
+      // Auto-select and close dialog
+      setSelectedReferenceId(node.id)
+      onOpenChange(false)
     },
-    [levelId, createNode],
+    [levelId, createNode, setSelectedReferenceId, onOpenChange],
   )
 
   const handleAddGuide = useCallback(
@@ -75,8 +78,11 @@ export function ReferencesDialog({ levelId, open, onOpenChange }: ReferencesDial
       })
       createNode(node, levelId as AnyNodeId)
       e.target.value = ''
+      // Auto-select and close dialog
+      setSelectedReferenceId(node.id)
+      onOpenChange(false)
     },
-    [levelId, createNode],
+    [levelId, createNode, setSelectedReferenceId, onOpenChange],
   )
 
   const handleEdit = useCallback(
diff --git a/packages/viewer/src/components/renderers/scan/scan-renderer.tsx b/packages/viewer/src/components/renderers/scan/scan-renderer.tsx
index 67e593a7..d186c9b4 100644
--- a/packages/viewer/src/components/renderers/scan/scan-renderer.tsx
+++ b/packages/viewer/src/components/renderers/scan/scan-renderer.tsx
@@ -38,9 +38,11 @@ const ScanModel = ({ url, opacity }: { url: string; opacity: number }) => {
       if (isTransparent) {
         material.transparent = true
         material.opacity = normalizedOpacity
+        material.depthWrite = false;
       } else {
         material.transparent = false
         material.opacity = 1
+        material.depthWrite = true;
       }
       material.needsUpdate = true
     }