Index: ntoskrnl/dbg/kdb_cli.c
===================================================================
--- ntoskrnl/dbg/kdb_cli.c	(revision 14597)
+++ ntoskrnl/dbg/kdb_cli.c	(working copy)
@@ -1969,6 +1978,7 @@
       if (KdDebugState & KD_DEBUG_KDSERIAL)
       {
          Key = (NextKey == '\0') ? KdbpGetCharSerial() : NextKey;
+         NextKey = '\0';
          ScanCode = 0;
          if (Key == KEY_ESC) /* ESC */
          {
@@ -1996,6 +2006,7 @@
       {
          ScanCode = 0;
          Key = (NextKey == '\0') ? KdbpGetCharKeyboard(&ScanCode) : NextKey;
+         NextKey = '\0';
       }
 
       if ((Buffer - Orig) >= (Size - 1))
@@ -2014,7 +2025,7 @@
             NextKey = KdbpTryGetCharSerial(5);
          else
             NextKey = KdbpTryGetCharKeyboard(&ScanCode, 5);
-         if (NextKey == '\n')
+         if (NextKey == '\n' || NextKey == -1) /* \n or no response at all */
             NextKey = '\0';
          DbgPrint("\n");
 	 /*