diff --git a/lisp/icomplete.el b/lisp/icomplete.el
index 975b9d5404e..6de3dd0b50a 100644
--- a/lisp/icomplete.el
+++ b/lisp/icomplete.el
@@ -1025,7 +1025,9 @@ away from the bottom.  Counts wrapped lines as real lines."
      collect (concat prefix
                      (make-string (max 0 (- max-prefix-len (length prefix))) ? )
                      (completion-lazy-hilit comp)
-                     (make-string (max 0 (- max-comp-len (length comp))) ? )
+                     (and suffix
+                          (make-string (max 0 (- max-comp-len (length comp)))
+                                       ? ))
                      suffix)
      into lines-aux
      finally (setq lines lines-aux