:: commit a62f81d2eea53683504639a12cd9c7a1e8bbd3ca

diff --git a/common/lib/panic.s2.c b/common/lib/panic.s2.c
index c481d2db..403d7dfe 100644
--- a/common/lib/panic.s2.c
+++ b/common/lib/panic.s2.c
@@ -48,6 +48,8 @@ noreturn void panic(bool allow_menu, const char *fmt, ...) {
     if (
 #if defined (BIOS)
       stage3_loaded == true &&
+#elif defined (UEFI)
+      efi_boot_services_exited == false &&
 #endif
       allow_menu == true) {
         print("Press a key to return to menu.");