diff --git a/src/xdisp.c b/src/xdisp.c
index 8b762bea4d9fbc3f7ac7b3a31ecd90dfbc90cc06..db0515d04c5c66f97b2757d7c46d4bee57e7b331 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -2076,10 +2076,16 @@ display_text_line (w, start, vpos, hpos, taboffset)
       && vpos == XFASTINT (w->top))
     {
       if (minibuf_prompt)
-	hpos = display_string (w, vpos, minibuf_prompt, -1, hpos,
+	{
+	  minibuf_prompt_width
+	    = (display_string (w, vpos, minibuf_prompt, -1, hpos,
 			       (!truncate ? continuer : truncator),
-			       1, -1, -1);
-      minibuf_prompt_width = hpos;
+			       1, -1, -1)
+	       - hpos);
+	  hpos += minibuf_prompt_width;
+	}
+      else
+	minibuf_prompt_width = 0;
     }
 
   desired_glyphs->bufp[vpos] = pos;