diff --git a/ChangeLog b/ChangeLog
index e45a3c011..8549d6056 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-07-04  Vincent Pelletier  <subdino2004@yahoo.fr>
+
+	* normal/cmdline.c (grub_cmdline_get): Don't fallback on ctrl-d
+	when backspace is pressed at beginning of line.
+
 2005-07-03  Yoshinori Okuji  <okuji@enbug.org>
 
 	* DISTLIST: Added genfslist.sh.
diff --git a/normal/cmdline.c b/normal/cmdline.c
index e431f2262..8b590353c 100644
--- a/normal/cmdline.c
+++ b/normal/cmdline.c
@@ -717,6 +717,8 @@ grub_cmdline_get (const char *prompt, char cmdline[], unsigned max_len,
 	      lpos--;
 	      cl_set_pos ();
 	    }
+          else
+            break;
 	  /* fall through */
 	  
 	case 4:	/* Ctrl-d */