diff --git a/ChangeLog b/ChangeLog
index e462dddc0..6e59b97ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-23  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/term/gfxterm.c (calculate_normal_character_width): Return 8
+	if no ASCII character is found to prevent crash.
+
 2011-03-23  Alexander Kurtz  <kurtz.alex@googlemail.com>
 
 	* grub-core/video/bitmap.c (match_extension): Ignore case.
diff --git a/grub-core/term/gfxterm.c b/grub-core/term/gfxterm.c
index 9a10d47b0..321479e0a 100644
--- a/grub-core/term/gfxterm.c
+++ b/grub-core/term/gfxterm.c
@@ -945,6 +945,8 @@ calculate_normal_character_width (grub_font_t font)
       if (glyph->device_width > width)
 	width = glyph->device_width;
     }
+  if (!width)
+    return 8;
 
   return width;
 }