diff --git a/core/modules/shortcut/shortcut.admin.js b/core/modules/shortcut/shortcut.admin.js
deleted file mode 100644
index 7fbdc5cec34b12c78fc21dbd28bd6dd740857e91..0000000000000000000000000000000000000000
--- a/core/modules/shortcut/shortcut.admin.js
+++ /dev/null
@@ -1,18 +0,0 @@
-(function ($) {
-
-  "use strict";
-
-  /**
-   * Make it so when you enter text into the "New set" textfield, the
-   * corresponding radio button gets selected.
-   */
-  Drupal.behaviors.newSet = {
-    attach: function (context, settings) {
-      var selectDefault = function () {
-        $(this).closest('form').find('.form-item-set .form-type-radio:last input').prop('checked', true);
-      };
-      $('div.form-item-new input').on('focus', selectDefault).on('keyup', selectDefault);
-    }
-  };
-
-})(jQuery);
diff --git a/core/modules/shortcut/shortcut.libraries.yml b/core/modules/shortcut/shortcut.libraries.yml
index 25f630d7f0e4c07e0b5a97d38caa74cf6222ffc1..90152dad4e452b11df606ef48a390f3e4d5946d7 100644
--- a/core/modules/shortcut/shortcut.libraries.yml
+++ b/core/modules/shortcut/shortcut.libraries.yml
@@ -1,11 +1,3 @@
-drupal.shortcut.admin:
-  version: VERSION
-  js:
-    shortcut.admin.js: {}
-  dependencies:
-    - core/jquery
-    - core/drupal
-
 drupal.shortcut:
   version: VERSION
   css:
diff --git a/core/modules/shortcut/src/Form/SwitchShortcutSet.php b/core/modules/shortcut/src/Form/SwitchShortcutSet.php
index 496fa0765eff8204278e1e712be29c6f25b0d899..897399714f538b8e47dd63d29cda13e979e33bb6 100644
--- a/core/modules/shortcut/src/Form/SwitchShortcutSet.php
+++ b/core/modules/shortcut/src/Form/SwitchShortcutSet.php
@@ -105,9 +105,13 @@ public function buildForm(array $form, FormStateInterface $form_state, UserInter
       $form['label'] = array(
         '#type' => 'textfield',
         '#title' => $this->t('Label'),
-        '#title_display' => 'invisible',
         '#description' => $this->t('The new set is created by copying items from your default shortcut set.'),
         '#access' => $add_access,
+        '#states' => array(
+          'visible' => array(
+            ':input[name="set"]' => array('value' => 'new'),
+          ),
+        ),
       );
       $form['id'] = array(
         '#type' => 'machine_name',
@@ -131,10 +135,6 @@ public function buildForm(array $form, FormStateInterface $form_state, UserInter
         $form['new']['#description'] = $this->t('The new set is created by copying items from the %default set.', array('%default' => $default_set->label()));
       }
 
-      $form['#attached'] = array(
-        'library' => array('shortcut/drupal.shortcut.admin'),
-      );
-
       $form['actions'] = array('#type' => 'actions');
       $form['actions']['submit'] = array(
         '#type' => 'submit',