diff --git a/ChangeLog b/ChangeLog
index d654fd7f6..92b7c867a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-05-04  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* util/grub.d/00_header.in: Make timeout apply to else
+	clause of hidden timout.
+	Reported by: Mads Kiilerich.
+
 2012-05-04  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/kern/fs.c (grub_fs_probe) [GRUB_UTIL]: Add workaround for
diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
index 765bfdcd3..04db1c83f 100644
--- a/util/grub.d/00_header.in
+++ b/util/grub.d/00_header.in
@@ -280,6 +280,8 @@ make_timeout ()
 	fi
 	cat << EOF
 if sleep$verbose --interruptible ${1} ; then
+  set timeout=0
+else
   set timeout=${2}
 fi
 EOF