diff --git a/resources/assets/js/annotations/components/annotationCanvas/measureInteraction.vue b/resources/assets/js/annotations/components/annotationCanvas/measureInteraction.vue
index c97dc4c42..11cb74882 100644
--- a/resources/assets/js/annotations/components/annotationCanvas/measureInteraction.vue
+++ b/resources/assets/js/annotations/components/annotationCanvas/measureInteraction.vue
@@ -57,12 +57,14 @@ export default {
             }
         },
         convertMeasurement() {
-            if (!this.hasSelectedLabel) {
-                this.requireSelectedLabel(false);
-            } else {
-                this.annotationSource.addFeature(this.measureFeature);
-                this.handleNewFeature({feature: this.measureFeature});
-                this.clearMeasureFeature();
+            if (this.isMeasuring && !this.cantConvertMeasureFeature) {
+                if (!this.hasSelectedLabel) {
+                    this.requireSelectedLabel(false);
+                } else {
+                    this.annotationSource.addFeature(this.measureFeature);
+                    this.handleNewFeature({feature: this.measureFeature});
+                    this.clearMeasureFeature();
+                }
             }
         },
         clearMeasureFeature() {
@@ -110,6 +112,7 @@ export default {
         measureInteraction.on('drawstart', this.handleMeasureDrawStart);
         measureInteraction.on('drawend', this.handleMeasureDrawEnd);
         Keyboard.on('Shift+f', this.toggleMeasuring, 0, this.listenerSet);
+        Keyboard.on('Enter', this.convertMeasurement, 0, this.listenerSet)
 
         // Do not make this reactive.
         // See: https://github.com/biigle/annotations/issues/108
diff --git a/resources/views/annotations/show/annotationCanvas.blade.php b/resources/views/annotations/show/annotationCanvas.blade.php
index 107b3d570..bfa40cd2a 100644
--- a/resources/views/annotations/show/annotationCanvas.blade.php
+++ b/resources/views/annotations/show/annotationCanvas.blade.php
@@ -32,7 +32,7 @@
                 </control-button>
                 <control-button icon="icon-linestring" title="Draw a line string 𝗙, hold 𝗦𝗵𝗶𝗳𝘁 for freehand" :active="isDrawingLineString" v-on:click="drawLineString">
                     <control-button icon="fa-ruler" title="Measure a line string  𝗦𝗵𝗶𝗳𝘁+𝗙" :active="isMeasuring" v-on:click="toggleMeasuring"></control-button>
-                    <control-button icon="fa-check" title="Convert measurement to a line string" :disabled="cantConvertMeasureFeature" v-on:click="convertMeasurement"></control-button>
+                    <control-button icon="fa-check" title="Convert measurement to a line string 𝗘𝗻𝘁𝗲𝗿" :disabled="cantConvertMeasureFeature" v-on:click="convertMeasurement"></control-button>
                 </control-button>
                 <control-button icon="icon-polygon" title="Draw a polygon 𝗚, hold 𝗦𝗵𝗶𝗳𝘁 for freehand" :active="isDrawingPolygon" v-on:click="drawPolygon">
                     <control-button v-cloak icon="fa-paint-brush" title="Draw a polygon using the brush tool 𝗘" :active="isUsingPolygonBrush" v-on:click="togglePolygonBrush"></control-button>
diff --git a/resources/views/manual/tutorials/annotations/shortcuts.blade.php b/resources/views/manual/tutorials/annotations/shortcuts.blade.php
index c9b4e9c71..881868cfb 100644
--- a/resources/views/manual/tutorials/annotations/shortcuts.blade.php
+++ b/resources/views/manual/tutorials/annotations/shortcuts.blade.php
@@ -145,6 +145,25 @@
             </tbody>
         </table>
 
+        <p>
+            When the ruler tool is activated:
+        </p>
+
+        <table class="table">
+            <thead>
+                <tr>
+                    <th>Key</th>
+                    <th>Function</th>
+                </tr>
+            </thead>
+            <tbody>
+                <tr>
+                    <td><kbd>Enter</kbd></td>
+                    <td>Convert measurement to a line string annotation</td>
+                </tr>
+            </tbody>
+        </table>
+
         <p>
             When Volare (cycle through annotations) is activated:
         </p>