diff --git a/src/add-ons/kernel/drivers/arch/x86/keyboard/keyboard.c b/src/add-ons/kernel/drivers/arch/x86/keyboard/keyboard.c
index 920165d188..7052f40074 100644
--- a/src/add-ons/kernel/drivers/arch/x86/keyboard/keyboard.c
+++ b/src/add-ons/kernel/drivers/arch/x86/keyboard/keyboard.c
@@ -197,7 +197,7 @@ handle_keyboard_interrupt(void *data)
 		 * useful, and SYS_REQ does a screen dump in BeOS).
 		 * ToDo: remove these key functions some day...
 		 */
-		case ESCAPE:
+		case F12:
 		case SYS_REQ:
 			panic("Keyboard Requested Halt\n");
 			break;
@@ -206,9 +206,6 @@ handle_keyboard_interrupt(void *data)
 			dbg_set_serial_debug(dbg_get_serial_debug() ? false : true);
 			break;
 #endif
-		case F12:
-			shutdown(true);
-			break;
 
 		case HOME:
 		case END:
diff --git a/src/add-ons/kernel/drivers/input/ps2_hid/keyboard.c b/src/add-ons/kernel/drivers/input/ps2_hid/keyboard.c
index 7b8f4acb15..2bf7369e99 100644
--- a/src/add-ons/kernel/drivers/input/ps2_hid/keyboard.c
+++ b/src/add-ons/kernel/drivers/input/ps2_hid/keyboard.c
@@ -80,6 +80,12 @@ handle_keyboard_interrupt(void *data)
 	scancode = read;
 	
 	TRACE(("scancode: %x\n", scancode));
+
+	// For now, F12 enters the kernel debugger
+	// ToDo: remove me later :-)
+	if (scancode == 88)
+		panic("keyboard requested halt.\n");
+
 	if (scancode & 0x80) {
 		keyInfo.is_keydown = false;
 		scancode -= 0x80;