diff --git a/common/keyboard_8042.c b/common/keyboard_8042.c
index 208b220659..7aa82e2de8 100644
--- a/common/keyboard_8042.c
+++ b/common/keyboard_8042.c
@@ -692,6 +692,8 @@ static int handle_keyboard_command(uint8_t command, uint8_t *output)
 
 	case I8042_ENA_KB:
 		update_ctl_ram(0, read_ctl_ram(0) & ~I8042_KBD_DIS);
+		keystroke_enable(1);
+		keyboard_clear_buffer();
 		break;
 
 	case I8042_READ_OUTPUT_PORT: