diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el
index b600cd91031..571e39cc8bf 100644
--- a/lisp/textmodes/fill.el
+++ b/lisp/textmodes/fill.el
@@ -546,9 +546,13 @@ space does not end a sentence, so don't break a line there."
 		      ;; character to find the correct break point.
 		      (if (not (and (eq (charset-after (1- (point))) 'ascii)
 				    (eq (charset-after (point)) 'ascii)))
-			  (fill-find-break-point (+ linebeg
-						    (current-left-margin)
-						    (length fill-prefix))))))
+			  ;; Make sure we take SOMETHING after the
+			  ;; fill prefix if any.
+			  (fill-find-break-point
+			   (save-excursion
+			     (goto-char linebeg)
+			     (move-to-column prefixcol)
+			     (point))))))
 
 		;; If the left margin and fill prefix by themselves
 		;; pass the fill-column, keep at least one word.