diff --git a/ChangeLog b/ChangeLog
index 163265bd0..6d4e29514 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-09-21  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/commands/keylayouts.c: Ignore unknown keys.
+
 2014-09-21  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/gmodule.pl.in: Accept newer binutils which output
diff --git a/grub-core/commands/keylayouts.c b/grub-core/commands/keylayouts.c
index da04389e3..f4b773020 100644
--- a/grub-core/commands/keylayouts.c
+++ b/grub-core/commands/keylayouts.c
@@ -173,8 +173,10 @@ grub_term_map_key (grub_keyboard_key_t code, int status)
 
   key = map_key_core (code, status, &alt_gr_consumed);
   
-  if (key == 0 || key == GRUB_TERM_SHIFT)
+  if (key == 0 || key == GRUB_TERM_SHIFT) {
     grub_printf ("Unknown key 0x%x detected\n", code);
+    return GRUB_TERM_NO_KEY;
+  }
   
   if (status & GRUB_TERM_STATUS_CAPS)
     {