diff --git a/src/indent.c b/src/indent.c
index 733272ee97b..265fd07f776 100644
--- a/src/indent.c
+++ b/src/indent.c
@@ -1467,7 +1467,10 @@ compute_motion (from, fromvpos, fromhpos, did_motion, to, tovpos, tohpos, width,
   val_compute_motion.bytepos = pos_byte;
   val_compute_motion.hpos = hpos;
   val_compute_motion.vpos = vpos;
-  val_compute_motion.prevhpos = prev_hpos;
+  if (contin_hpos && prev_hpos == 0)
+    val_compute_motion.prevhpos = contin_hpos;
+  else
+    val_compute_motion.prevhpos = prev_hpos;
   /* We alalways handle all of them here; none of them remain to do.  */
   val_compute_motion.ovstring_chars_done = 0;