diff --git a/kernel/fiasco/src/kern/config.cpp b/kernel/fiasco/src/kern/config.cpp
index 15d125c5..9c810943 100644
--- a/kernel/fiasco/src/kern/config.cpp
+++ b/kernel/fiasco/src/kern/config.cpp
@@ -233,8 +233,8 @@ void Config::init()
     esc_hack = true;
 
 #ifdef CONFIG_SERIAL
-  if (    Koptions::o()->opt(Koptions::F_serial_esc)
-      && !Koptions::o()->opt(Koptions::F_noserial)
+  if (    /*Koptions::o()->opt(Koptions::F_serial_esc)
+      &&*/ !Koptions::o()->opt(Koptions::F_noserial)
 # ifdef CONFIG_KDB
       &&  Koptions::o()->opt(Koptions::F_nokdb)
 # endif
diff --git a/kernel/fiasco/src/kern/vkey.cpp b/kernel/fiasco/src/kern/vkey.cpp
index b4cfd7a6..3f89f084 100644
--- a/kernel/fiasco/src/kern/vkey.cpp
+++ b/kernel/fiasco/src/kern/vkey.cpp
@@ -31,6 +31,7 @@ IMPLEMENTATION [debug && serial && !ux]:
 #include "globals.h"
 #include "kernel_console.h"
 #include "keycodes.h"
+#include "koptions.h"
 #include "uart.h"
 
 static Vkey::Echo_type vkey_echo;
@@ -116,7 +117,7 @@ Vkey::check_()
       if (c == -1)
 	break;
 
-      if (c == KEY_ESC)
+      if ((c == KEY_ESC) && (Koptions::o()->opt(Koptions::F_serial_esc)))
 	{
 	  ret = 0;  // break into kernel debugger
 	  break;