diff --git misc/machine-name.js misc/machine-name.js
index 0e7870e..b218f31 100644
--- misc/machine-name.js
+++ misc/machine-name.js
@@ -65,23 +65,33 @@ Drupal.behaviors.machineName = {
           });
         $suffix.append(' ').append($link);
 
-        // Preview machine name in realtime when the human-readable name changes.
-        $source.bind('keyup.machineName change.machineName', function () {
-          machine = self.transliterate($(this).val(), options);
-          // Set the machine name to the transliterated value.
-          if (machine != options.replace && machine != '') {
-            $target.val(machine);
-            $preview.text(machine);
-            $suffix.show();
-          }
-          else {
-            $suffix.hide();
-            $target.val(machine);
-            $preview.empty();
-          }
-        });
-        // Initialize machine name preview.
-        $source.keyup();
+        // Show an edit link and the maching name value, and optionally preview
+        // the machine name in realtime when the human-readable name changes.
+        if ($target.val() == '') {
+          // We only update the machine name automatically if we do not yet
+          // have a machine name. I.e. when adding a new one, not when editing.
+          $source.bind('keyup.machineName change.machineName', function () {
+            machine = self.transliterate($(this).val(), options);
+            // Set the machine name to the transliterated value.
+            if (machine != options.replace && machine != '') {
+              $target.val(machine);
+              $preview.text(machine);
+              $suffix.show();
+            }
+            else {
+              $suffix.hide();
+              $target.val(machine);
+              $preview.empty();
+            }
+          });
+          // Initialize machine name preview.
+          $source.keyup();
+        }
+        else {
+          // Just show the edit link and maching_name value.
+          $preview.text($target.val());
+          $suffix.show();
+        }
       }
     });
   },