diff --git a/ChangeLog b/ChangeLog
index 37a1bba3d..b7d679cae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-02-18 Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/kern/emu/console.c: Move to ...
+	* grub-core/term/emu/console.c: ...here.
+	(grub_ncurses_getkey): Fix return value if no key is detected.
+
 2012-02-12  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* include/grub/test.h (grub_unit_test_init): Add missing prototype.
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
index 9d3d208f9..28dc7c192 100644
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -207,7 +207,6 @@ kernel = {
   emu = gnulib/progname.c;
   emu = gnulib/error.c;
   emu = kern/emu/cache_s.S;
-  emu = kern/emu/console.c;
   emu = kern/emu/hostdisk.c;
   emu = kern/emu/hostfs.c;
   emu = kern/emu/main.c;
@@ -215,6 +214,7 @@ kernel = {
   emu = kern/emu/mm.c;
   emu = kern/emu/time.c;
   emu = kern/emu/cache.c;
+  emu = term/emu/console.c;
 
   videoinkernel = term/gfxterm.c;
   videoinkernel = font/font.c;
diff --git a/grub-core/kern/emu/console.c b/grub-core/term/emu/console.c
similarity index 99%
rename from grub-core/kern/emu/console.c
rename to grub-core/term/emu/console.c
index 7fd1fc0c9..55e3a6b7f 100644
--- a/grub-core/kern/emu/console.c
+++ b/grub-core/term/emu/console.c
@@ -116,7 +116,7 @@ grub_ncurses_getkey (struct grub_term_input *term __attribute__ ((unused)))
   switch (c)
     {
     case ERR:
-      return -1;
+      return GRUB_TERM_NO_KEY;
     case KEY_LEFT:
       c = GRUB_TERM_KEY_LEFT;
       break;