diff --git a/src/components/three/ModelViewer.tsx b/src/components/three/ModelViewer.tsx
index a71406a..445c733 100644
--- a/src/components/three/ModelViewer.tsx
+++ b/src/components/three/ModelViewer.tsx
@@ -550,7 +550,14 @@ function MeasureClickHandler() {
       const st = useModelStore.getState();
       if (!st.measureMode) return;
 
-      // Prefer snap
+      // If a hover label is currently shown (hole diameter or edge length),
+      // a click registers it as a saved measurement.
+      if (st.hoverInfo) {
+        st.registerHoverMeasurement(st.hoverInfo);
+        return;
+      }
+
+      // Prefer snap (vertex snap, or hole-center snap from SmartSnapHandler)
       if (st.snapPoint) {
         st.addMeasurePoint({ x: st.snapPoint.x, y: st.snapPoint.y, z: st.snapPoint.z });
         return;