diff --git a/ChangeLog b/ChangeLog
index 8425aff66..5ca62d00b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-03-25  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/normal/menu.c: Wait if there were errors shown at "boot"
+	command.
+
 2013-03-25  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Replace the region at 0 from coreboot tables to available in BSD
diff --git a/grub-core/normal/menu.c b/grub-core/normal/menu.c
index 7e0a15859..787b28775 100644
--- a/grub-core/normal/menu.c
+++ b/grub-core/normal/menu.c
@@ -250,10 +250,15 @@ grub_menu_execute_entry(grub_menu_entry_t entry, int auto_boot)
   if (errs_before != grub_err_printed_errors)
     grub_wait_after_message ();
 
+  errs_before = grub_err_printed_errors;
+
   if (grub_errno == GRUB_ERR_NONE && grub_loader_is_loaded ())
     /* Implicit execution of boot, only if something is loaded.  */
     grub_command_execute ("boot", 0, 0);
 
+  if (errs_before != grub_err_printed_errors)
+    grub_wait_after_message ();
+
   if (entry->submenu)
     {
       if (menu && menu->size)