diff --git a/reactos/ntoskrnl/kdbg/kdb_cli.c b/reactos/ntoskrnl/kdbg/kdb_cli.c
index 99a4dab2dd5..7c63cc3ede9 100644
--- a/reactos/ntoskrnl/kdbg/kdb_cli.c
+++ b/reactos/ntoskrnl/kdbg/kdb_cli.c
@@ -3489,6 +3489,9 @@ KdpPrompt(IN LPSTR InString,
                         *(KdpPromptString.Buffer + i));
     }
 
+    if (!(KdbDebugState & KD_DEBUG_KDSERIAL))
+        KbdDisableMouse();
+
     /* Loop the whole string */
     for (i = 0; i < OutStringLength; i++)
     {
@@ -3556,6 +3559,9 @@ KdpPrompt(IN LPSTR InString,
         KdPortPutByteEx(&SerialPortInfo, Response);
     }
 
+    if (!(KdbDebugState & KD_DEBUG_KDSERIAL))
+        KbdEnableMouse();
+
     /* Print a new line */
     KdPortPutByteEx(&SerialPortInfo, '\r');
     KdPortPutByteEx(&SerialPortInfo, '\n');
diff --git a/reactos/ntoskrnl/kdbg/kdb_keyboard.c b/reactos/ntoskrnl/kdbg/kdb_keyboard.c
index 139db963034..32e701531f5 100644
--- a/reactos/ntoskrnl/kdbg/kdb_keyboard.c
+++ b/reactos/ntoskrnl/kdbg/kdb_keyboard.c
@@ -93,13 +93,11 @@ KbdSendCommandToMouse(UCHAR Command)
 VOID KbdEnableMouse()
 {
     KbdSendCommandToMouse(MOU_ENAB);
-    // kbd_write_command(KBD_ENABLE_MOUSE);
 }
 
 VOID KbdDisableMouse()
 {
     KbdSendCommandToMouse(MOU_DISAB);
-    // kbd_write_command(KBD_DISABLE_MOUSE);
 }
 
 CHAR