diff --git a/ChangeLog b/ChangeLog
index e1e07ecc9..e4bbda818 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-09-23  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/video/efi_gop.c (grub_video_gop_setup): Fix a typo which
+	desactivated use of EDID at all.
+
 2013-09-23  Vladimir Serbinenko  <phcoder@gmail.com>
 2013-09-23  neil
 
diff --git a/grub-core/video/efi_gop.c b/grub-core/video/efi_gop.c
index f73a278b7..428564400 100644
--- a/grub-core/video/efi_gop.c
+++ b/grub-core/video/efi_gop.c
@@ -367,8 +367,7 @@ grub_video_gop_setup (unsigned int width, unsigned int height,
 
   if (width == 0 && height == 0)
     {
-      err = 1;
-      grub_gop_get_preferred_mode (&preferred_width, &preferred_height);
+      err = grub_gop_get_preferred_mode (&preferred_width, &preferred_height);
       if (err || preferred_width >= 4096 || preferred_height >= 4096)
 	{
 	  preferred_width = 800;