diff --git a/ChangeLog b/ChangeLog
index 0b0fa4ae6..00c23e229 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-05-14  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/normal/cmdline.c (grub_cmdline_get): Fix off-by-one error
+	to avoid losing last column.
+
 2013-05-14  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* po/exclude.pot: Add missing string "%C".
diff --git a/grub-core/normal/cmdline.c b/grub-core/normal/cmdline.c
index a9627ca76..71d9bd1fc 100644
--- a/grub-core/normal/cmdline.c
+++ b/grub-core/normal/cmdline.c
@@ -237,9 +237,9 @@ grub_cmdline_get (const char *prompt_translated)
 
   void cl_set_pos (struct cmdline_term *cl_term)
   {
-    cl_term->xpos = (cl_term->prompt_len + lpos) % (cl_term->width - 1);
+    cl_term->xpos = (cl_term->prompt_len + lpos) % cl_term->width;
     cl_term->ypos = cl_term->ystart
-      + (cl_term->prompt_len + lpos) / (cl_term->width - 1);
+      + (cl_term->prompt_len + lpos) / cl_term->width;
     grub_term_gotoxy (cl_term->term, cl_term->xpos, cl_term->ypos);
   }