diff --git a/admin/renderer.php b/admin/renderer.php
index 155aa23d073..797f40a0c73 100644
--- a/admin/renderer.php
+++ b/admin/renderer.php
@@ -2243,10 +2243,11 @@ class core_admin_renderer extends plugin_renderer_base {
 
         $output = '';
         $output .= $this->header();
-        $output .= $this->container_start('upgradekeyreq');
         $output .= $this->heading(get_string('upgradekeyreq', 'core_admin'));
+        $output .= $this->container_start('upgradekeyreq w-25');
         $output .= html_writer::start_tag('form', array('method' => 'POST', 'action' => $url));
         $output .= html_writer::empty_tag('input', [
+            'id' => 'upgradekey',
             'name' => 'upgradekey',
             'type' => 'password',
             'class' => 'form-control w-auto',
diff --git a/lib/templates/form_input_toggle_sensitive.mustache b/lib/templates/form_input_toggle_sensitive.mustache
index 21335aa30cc..9a808e4b923 100644
--- a/lib/templates/form_input_toggle_sensitive.mustache
+++ b/lib/templates/form_input_toggle_sensitive.mustache
@@ -34,7 +34,7 @@
         "sensitiveinput": "<input type=\"password\" name=\"password\" id=\"password\">"
     }
 }}
-<div class="toggle-sensitive-wrapper {{#smallscreensonly}}small-screens-only{{/smallscreensonly}} input-group mb-3">
+<div class="toggle-sensitive-wrapper {{#smallscreensonly}}small-screens-only{{/smallscreensonly}} input-group">
     {{{sensitiveinput}}}
     <button class="toggle-sensitive-btn btn btn-secondary" type="button" {{!
         !}}aria-label="{{#str}}togglesensitive, form{{/str}}">
diff --git a/lib/upgradelib.php b/lib/upgradelib.php
index 0083d2cc9a9..293968a5c88 100644
--- a/lib/upgradelib.php
+++ b/lib/upgradelib.php
@@ -2502,6 +2502,9 @@ function check_upgrade_key($upgradekeyhash) {
         if ($upgradekeyhash === null or $upgradekeyhash !== sha1($CFG->config_php_settings['upgradekey'])) {
             if (!$PAGE->headerprinted) {
                 $PAGE->set_title(get_string('upgradekeyreq', 'admin'));
+                $PAGE->requires->js_call_amd('core/togglesensitive', 'init', ['upgradekey']);
+
+                /** @var core_admin_renderer $output */
                 $output = $PAGE->get_renderer('core', 'admin');
                 echo $output->upgradekey_form_page(new moodle_url('/admin/index.php', array('cache' => 0)));
                 die();
diff --git a/theme/boost/scss/moodle/admin.scss b/theme/boost/scss/moodle/admin.scss
index ee7f0e90876..589c9499261 100644
--- a/theme/boost/scss/moodle/admin.scss
+++ b/theme/boost/scss/moodle/admin.scss
@@ -141,6 +141,10 @@
     text-align: left;
 }
 
+#page-admin-index .upgradekeyreq {
+    min-width: 220px;
+}
+
 #page-admin-index .adminwarning.availableupdatesinfo .moodleupdateinfo span {
     display: block;
 }
diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css
index 62c10088276..637ce7631e4 100644
--- a/theme/boost/style/moodle.css
+++ b/theme/boost/style/moodle.css
@@ -29074,6 +29074,10 @@ img.icon {
   text-align: left;
 }
 
+#page-admin-index .upgradekeyreq {
+  min-width: 220px;
+}
+
 #page-admin-index .adminwarning.availableupdatesinfo .moodleupdateinfo span {
   display: block;
 }
diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css
index 67f93406fe7..368fcf6181d 100644
--- a/theme/classic/style/moodle.css
+++ b/theme/classic/style/moodle.css
@@ -29080,6 +29080,10 @@ img.icon {
   text-align: left;
 }
 
+#page-admin-index .upgradekeyreq {
+  min-width: 220px;
+}
+
 #page-admin-index .adminwarning.availableupdatesinfo .moodleupdateinfo span {
   display: block;
 }