diff --git a/admin/renderer.php b/admin/renderer.php
index ef81b63786bb3..780b3eef06774 100644
--- a/admin/renderer.php
+++ b/admin/renderer.php
@@ -2189,10 +2189,11 @@ public function upgradekey_form_page($url) {
 
         $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 ba47b469c0c8b..627fd2f510ffc 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}}}
     <div class="input-group-append">
         <button class="toggle-sensitive-btn btn btn-secondary" type="button" {{!
diff --git a/lib/upgradelib.php b/lib/upgradelib.php
index a6728d06681c8..f6c1c6fde60d3 100644
--- a/lib/upgradelib.php
+++ b/lib/upgradelib.php
@@ -2555,6 +2555,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 65cc85f109c2f..482eadf2eb810 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 cd7e088e055c5..dbd5ed26c50dc 100644
--- a/theme/boost/style/moodle.css
+++ b/theme/boost/style/moodle.css
@@ -26609,6 +26609,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 b44c612289771..e5469f4e3bad9 100644
--- a/theme/classic/style/moodle.css
+++ b/theme/classic/style/moodle.css
@@ -26609,6 +26609,10 @@ img.icon {
   text-align: left;
 }
 
+#page-admin-index .upgradekeyreq {
+  min-width: 220px;
+}
+
 #page-admin-index .adminwarning.availableupdatesinfo .moodleupdateinfo span {
   display: block;
 }