diff --git a/core/core.libraries.yml b/core/core.libraries.yml
index b9075b15b4779386616f7da98819e4a2a8932fd7..fc659c8401804b30ef6d4c22a2304313cff78553 100644
--- a/core/core.libraries.yml
+++ b/core/core.libraries.yml
@@ -212,6 +212,7 @@ drupal.machine-name:
     - core/jquery.once
     - core/drupal
     - core/drupalSettings
+    - core/drupal.form
 
 drupal.progress:
   version: VERSION
diff --git a/core/misc/form.js b/core/misc/form.js
index b1d1ffff78bbdc0d97f09a2e22768a12b62d453c..68b4e9e16723cc89655a7561080c31d092f506a9 100644
--- a/core/misc/form.js
+++ b/core/misc/form.js
@@ -134,7 +134,7 @@
         // Initialize form behaviors, use $.makeArray to be able to use native
         // forEach array method and have the callback parameters in the right order.
         $.makeArray($forms).forEach(function (form) {
-          var events = 'change.formUpdated keypress.formUpdated';
+          var events = 'change.formUpdated input.formUpdated ';
           var eventHandler = debounce(function (event) { triggerFormUpdated(event.target); }, 300);
           formFields = fieldsList(form).join(',');
 
diff --git a/core/misc/machine-name.js b/core/misc/machine-name.js
index 535f9d2a881449c7c6605b537fc2312fe4797c40..13e0034f2e9d71ec0437b936bcd190559155a0cc 100644
--- a/core/misc/machine-name.js
+++ b/core/misc/machine-name.js
@@ -132,9 +132,9 @@
         // changes, but only if there is no machine name yet; i.e., only upon
         // initial creation, not when editing.
         if ($target.val() === '') {
-          $source.on('keyup.machineName change.machineName input.machineName', eventData, machineNameHandler)
+          $source.on('formUpdated.machineName', eventData, machineNameHandler)
             // Initialize machine name preview.
-            .trigger('keyup');
+            .trigger('formUpdated.machineName');
         }
 
         // Add a listener for an invalid event on the machine name input