diff --git a/src/components/three/ModelViewer.tsx b/src/components/three/ModelViewer.tsx
index b728924..d06236d 100644
--- a/src/components/three/ModelViewer.tsx
+++ b/src/components/three/ModelViewer.tsx
@@ -269,15 +269,16 @@ function MeasurementOverlay() {
         <SnapRing position={[snapPoint.x, snapPoint.y, snapPoint.z]} />
       )}
 
-      {/* Hover auto-detect tooltip */}
+      {/* Hover auto-detect tooltip (works both inside and outside measure mode) */}
       {hoverInfo && (
         <MeasurementLabel
           position={hoverInfo.position}
-          text={`${hoverInfo.type === 'hole' ? '⌀ ' : ''}${hoverInfo.value.toFixed(1)} mm`}
-          variant="primary"
+          text={hoverInfo.type === 'hole'
+            ? `Ø ${hoverInfo.value.toFixed(1)}`
+            : `${hoverInfo.value.toFixed(1)} mm`}
+          variant={hoverInfo.type === 'hole' ? 'accent' : 'primary'}
           fixed
         />
-
       )}
 
       {/* Pending first point */}
@@ -295,6 +296,26 @@ function MeasurementOverlay() {
           (a[2] + b[2]) / 2,
         ];
 
+        if (m.kind === 'hole') {
+          return (
+            <group key={m.id}>
+              <PointMarker position={a} color="#f59e0b" />
+              <MeasurementLabel position={a} text={m.label ?? `Ø ${m.distanceMM.toFixed(1)}`} variant="accent" />
+            </group>
+          );
+        }
+
+        if (m.kind === 'edge') {
+          return (
+            <group key={m.id}>
+              <PointMarker position={a} color="#22c55e" />
+              <PointMarker position={b} color="#22c55e" />
+              <Line points={[a, b]} color="#22c55e" lineWidth={2} depthTest={false} />
+              <MeasurementLabel position={mid} text={m.label ?? `${m.distanceMM.toFixed(1)} mm`} variant="success" />
+            </group>
+          );
+        }
+
         return (
           <group key={m.id}>
             <PointMarker position={a} color="#22c55e" />