diff --git a/lisp/icomplete.el b/lisp/icomplete.el
index bbfb817064d..085c111d856 100644
--- a/lisp/icomplete.el
+++ b/lisp/icomplete.el
@@ -243,13 +243,15 @@ and `minibuffer-setup-hook'."
 		;; embarking on computing completions:
 		(sit-for icomplete-compute-delay)))
 	  (let ((text (while-no-input
-			(icomplete-completions
-			 (field-string)
-			 minibuffer-completion-table
-			 minibuffer-completion-predicate
-			 (not minibuffer-completion-confirm))))
+			(list
+			 (icomplete-completions
+			  (field-string)
+			  minibuffer-completion-table
+			  minibuffer-completion-predicate
+			  (not minibuffer-completion-confirm)))))
 		(buffer-undo-list t))
-	    (if text (insert text)))))))
+	    ;; Do nothing if while-no-input was aborted.
+	    (if (consp text) (insert (car text))))))))
 
 ;;;_ > icomplete-completions (name candidates predicate require-match)
 (defun icomplete-completions (name candidates predicate require-match)