diff --git a/ChangeLog b/ChangeLog
index 5f3251fcb..e25639a42 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-04-09  EFI Coder <eficoder@hotmail.com>
+
+	* normal/menu_text.c (print_message): Clean up the message and show
+	the Fn information when on EFI
+	* term/efi/console.c (grub_console_checkkey): Add F4 support.
+
 2010-04-09  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* normal/autofs.c (read_fs_list): New parameter 'prefix'.
diff --git a/normal/menu_text.c b/normal/menu_text.c
index b39f57512..bb0587502 100644
--- a/normal/menu_text.c
+++ b/normal/menu_text.c
@@ -176,10 +176,17 @@ print_message (int nested, int edit, struct grub_term_output *term)
   if (edit)
     {
       grub_putcode ('\n', term);
+#ifdef GRUB_MACHINE_EFI
+      grub_print_message_indented (_("Minimum Emacs-like screen editing is \
+supported. TAB lists completions. Press F1 to boot, F2=Ctrl-a, F3=Ctrl-e, \
+F4 for a command-line or ESC to discard edits and return to the GRUB menu."),
+                                   STANDARD_MARGIN, STANDARD_MARGIN, term);
+#else
       grub_print_message_indented (_("Minimum Emacs-like screen editing is \
 supported. TAB lists completions. Press Ctrl-x to boot, Ctrl-c for a \
-command-line or ESC to return menu."), STANDARD_MARGIN, STANDARD_MARGIN,
-				   term);
+command-line or ESC to discard edits and return to the GRUB menu."),
+                                   STANDARD_MARGIN, STANDARD_MARGIN, term);
+#endif
     }
   else
     {
diff --git a/term/efi/console.c b/term/efi/console.c
index 264770cae..c33cffdfe 100644
--- a/term/efi/console.c
+++ b/term/efi/console.c
@@ -194,6 +194,9 @@ grub_console_checkkey (void)
 	case 0x0d:
 	  read_key = 5;
 	  break;
+	case 0x0e:
+	  read_key = 3;
+	  break;
 	case 0x17:
 	  read_key = '\e';
 	  break;