diff --git a/ChangeLog b/ChangeLog
index ab7f80274..b4ab4164c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-02-17  Christian Franke  <franke@computer.org>
+
+	* commands/cat.c (grub_cmd_cat): Add break on GRUB_TERM_ESC key.
+
 2008-02-17  Robert Millan  <rmh@aybabtu.com>
 
 	* util/i386/pc/grub-setup.c (setup): In find_first_partition_start(),
diff --git a/commands/cat.c b/commands/cat.c
index 834fd063b..3a0d1f8fb 100644
--- a/commands/cat.c
+++ b/commands/cat.c
@@ -59,6 +59,12 @@ grub_cmd_cat (struct grub_arg_list *state __attribute__ ((unused)),
 	      grub_setcolorstate (GRUB_TERM_COLOR_STANDARD);
 	    }
 	}
+
+      if (GRUB_TERM_ASCII_CHAR (grub_checkkey ()) == GRUB_TERM_ESC)
+	{
+	  grub_getkey ();
+	  break;
+	}
     }
 
   grub_putchar ('\n');