diff --git a/ChangeLog b/ChangeLog
index fdce6dfe0..1b9d768ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-04-08  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/normal/term.c (print_ucs4_terminal): Don't try to put the
+	word on new line if it's too long anyway. Fixes a hang.
+
 2011-04-08  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* include/grub/util/raid.h (grub_util_raid_getmembers): Make argument
diff --git a/grub-core/normal/term.c b/grub-core/normal/term.c
index a1aa3d783..9c4b491f5 100644
--- a/grub-core/normal/term.c
+++ b/grub-core/normal/term.c
@@ -552,7 +552,7 @@ print_ucs4_terminal (const grub_uint32_t * str,
 	  if (line_width > max_width && last_space > line_start)
 	    ptr = last_space;
 	  else if (line_width > max_width 
-		   && line_start == str && startwidth != 0)
+		   && line_start == str && line_width - lastspacewidth < max_width - 5)
 	    {
 	      ptr = str;
 	      lastspacewidth = startwidth;