diff --git a/ChangeLog b/ChangeLog
index 2235c6852..ec5a8ffca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-03-11  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/commands/cat.c (grub_cmd_cat): Fix termination key check.
+
 2012-03-10  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* configure.ac: Bump up the version to beta2.
diff --git a/grub-core/commands/cat.c b/grub-core/commands/cat.c
index 7dccce823..cd2d76099 100644
--- a/grub-core/commands/cat.c
+++ b/grub-core/commands/cat.c
@@ -77,8 +77,9 @@ grub_cmd_cat (grub_extcmd_context_t ctxt, int argc, char **args)
 	    }
 	}
 
-      while ((key = grub_getkey_noblock ()) != GRUB_TERM_ESC)
-	;
+      do
+	key = grub_getkey_noblock ();
+      while (key != GRUB_TERM_ESC && key != GRUB_TERM_NO_KEY);
     }
 
   grub_xputs ("\n");