diff -u b/core/misc/machine-name.js b/core/misc/machine-name.js
--- b/core/misc/machine-name.js
+++ b/core/misc/machine-name.js
@@ -34,7 +34,6 @@
 
       function clickEditHandler(e) {
         var data = e.data;
-        e.preventDefault();
         data.$wrapper.removeClass('visually-hidden');
         data.$target.trigger('focus');
         data.$suffix.hide();
@@ -74,11 +73,6 @@
         }, 300);
       }
 
-      function invalidHandler(e) {
-        var data = e.data;
-        data.$wrapper.removeClass('visually-hidden');
-      }
-
       Object.keys(settings.machineName).forEach(function (source_id) {
         var machine;
         var eventData;
@@ -144,8 +138,8 @@
         }
 
         // Add a listener for an invalid event on the machine name input
-        // to show its container.
-        $target.on('invalid', eventData, invalidHandler);
+        // to show its container and focus it.
+        $target.on('invalid', eventData, clickEditHandler);
       });
     },