diff --git a/overlay.d/05core/usr/lib/dracut/modules.d/99emergency-timeout/timeout.sh b/overlay.d/05core/usr/lib/dracut/modules.d/99emergency-shell-setup/emergency-shell.sh
similarity index 63%
rename from overlay.d/05core/usr/lib/dracut/modules.d/99emergency-timeout/timeout.sh
rename to overlay.d/05core/usr/lib/dracut/modules.d/99emergency-shell-setup/emergency-shell.sh
index ec0122b8a0..a0884a7583 100644
--- a/overlay.d/05core/usr/lib/dracut/modules.d/99emergency-timeout/timeout.sh
+++ b/overlay.d/05core/usr/lib/dracut/modules.d/99emergency-shell-setup/emergency-shell.sh
@@ -1,7 +1,4 @@
-# Before starting the emergency shell, prompt the user to press Enter.
-# If they don't, reboot the system.
-#
-# Assumes /bin/sh is bash.
+# Display relevant errors then enter emergency shell
 
 # _wait_for_journalctl_to_stop will block until either:
 # - no messages have appeared in journalctl for the past 5 seconds
@@ -22,13 +19,7 @@ _wait_for_journalctl_to_stop() {
     done
 }
 
-_prompt_for_timeout() {
-    local timeout=300
-    local interval=15
-
-    if [[ -e /.emergency-shell-confirmed ]]; then
-        return
-    fi
+_display_relevant_errors() { 
     failed=$(systemctl --failed --no-legend --plain | cut -f 1 -d ' ')
     if [ -n "${failed}" ]; then
         # Something failed, suppress kernel logs so that it's more likely
@@ -77,41 +68,9 @@ EOF
             done
         fi
     fi
-
-    # Regularly prompt with time remaining.  This ensures the prompt doesn't
-    # get lost among kernel and systemd messages, and makes it clear what's
-    # going on if the user just connected a serial console.
-    while [[ $timeout > 0 ]]; do
-        local m=$(( $timeout / 60 ))
-        local s=$(( $timeout % 60 ))
-        local m_label="minutes"
-        if [[ $m = 1 ]]; then
-            m_label="minute"
-        fi
-
-        if [[ $s != 0 ]]; then
-            echo -n -e "Press Enter for emergency shell or wait $m $m_label $s seconds for reboot.      \r"
-        else
-            echo -n -e "Press Enter for emergency shell or wait $m $m_label for reboot.                 \r"
-        fi
-
-        local anything
-        if read -t $interval anything; then
-            > /.emergency-shell-confirmed
-            return
-        fi
-        timeout=$(( $timeout - $interval ))
-    done
-
-    echo -e "\nRebooting."
-    # This is not very nice, but since reboot.target likely conflicts with
-    # the existing goal target wrt the desired state of shutdown.target,
-    # there doesn't seem to be a better option.
-    systemctl reboot --force
-    exit 0
 }
 
 # If we're invoked from a dracut breakpoint rather than
 # dracut-emergency.service, we won't have a controlling terminal and stdio
 # won't be connected to it. Explicitly read/write /dev/console.
-_prompt_for_timeout < /dev/console > /dev/console
+_display_relevant_errors < /dev/console > /dev/console
diff --git a/overlay.d/05core/usr/lib/dracut/modules.d/99emergency-timeout/ignition-virtio-dump-journal.service b/overlay.d/05core/usr/lib/dracut/modules.d/99emergency-shell-setup/ignition-virtio-dump-journal.service
similarity index 100%
rename from overlay.d/05core/usr/lib/dracut/modules.d/99emergency-timeout/ignition-virtio-dump-journal.service
rename to overlay.d/05core/usr/lib/dracut/modules.d/99emergency-shell-setup/ignition-virtio-dump-journal.service
diff --git a/overlay.d/05core/usr/lib/dracut/modules.d/99emergency-timeout/ignition-virtio-dump-journal.sh b/overlay.d/05core/usr/lib/dracut/modules.d/99emergency-shell-setup/ignition-virtio-dump-journal.sh
similarity index 100%
rename from overlay.d/05core/usr/lib/dracut/modules.d/99emergency-timeout/ignition-virtio-dump-journal.sh
rename to overlay.d/05core/usr/lib/dracut/modules.d/99emergency-shell-setup/ignition-virtio-dump-journal.sh
diff --git a/overlay.d/05core/usr/lib/dracut/modules.d/99emergency-timeout/module-setup.sh b/overlay.d/05core/usr/lib/dracut/modules.d/99emergency-shell-setup/module-setup.sh
similarity index 93%
rename from overlay.d/05core/usr/lib/dracut/modules.d/99emergency-timeout/module-setup.sh
rename to overlay.d/05core/usr/lib/dracut/modules.d/99emergency-shell-setup/module-setup.sh
index 456111aab1..df52cba573 100755
--- a/overlay.d/05core/usr/lib/dracut/modules.d/99emergency-timeout/module-setup.sh
+++ b/overlay.d/05core/usr/lib/dracut/modules.d/99emergency-shell-setup/module-setup.sh
@@ -18,7 +18,7 @@ install() {
         date \
         dd
 
-    inst_hook emergency 99 "${moddir}/timeout.sh"
+    inst_hook emergency 99 "${moddir}/emergency-shell.sh"
 
     inst_script "$moddir/ignition-virtio-dump-journal.sh" "/usr/bin/ignition-virtio-dump-journal"
     install_unit_wants ignition-virtio-dump-journal.service emergency.target