diff --git a/ChangeLog b/ChangeLog
index 6b6a82a35..758b5cb5f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-08-22  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* term/at_keyboard.c (grub_at_keyboard_getkey_noblock): Don't discard
+	a key after CapsLock or NumLock. It's just a qemu bug.
+
 2010-08-21  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* include/grub/usb.h (grub_usb_device): Add 'data' field back. It's
diff --git a/term/at_keyboard.c b/term/at_keyboard.c
index f8595a41a..2b7dd9bee 100644
--- a/term/at_keyboard.c
+++ b/term/at_keyboard.c
@@ -149,9 +149,6 @@ grub_at_keyboard_getkey_noblock (void)
   switch (code)
     {
       case CAPS_LOCK:
-	/* Caps lock sends scan code twice.  Get the second one and discard it.  */
-	while (grub_keyboard_getkey () == -1);
-
 	at_keyboard_status ^= GRUB_TERM_STATUS_CAPS;
 	led_status ^= KEYBOARD_LED_CAPS;
 	keyboard_controller_led (led_status);
@@ -161,9 +158,6 @@ grub_at_keyboard_getkey_noblock (void)
 #endif
 	return -1;
       case NUM_LOCK:
-	/* Num lock sends scan code twice.  Get the second one and discard it.  */
-	while (grub_keyboard_getkey () == -1);
-
 	at_keyboard_status ^= GRUB_TERM_STATUS_NUM;
 	led_status ^= KEYBOARD_LED_NUM;
 	keyboard_controller_led (led_status);