diff --git a/lisp/facemenu.el b/lisp/facemenu.el
index 7417bb1203..d4d6975061 100644
--- a/lisp/facemenu.el
+++ b/lisp/facemenu.el
@@ -542,8 +542,7 @@ list-colors-display
 colors that the current display can handle.  Customize
 `list-colors-sort' to change the order in which colors are shown.
 Type \\<help-mode-map>\\[revert-buffer] after customizing \
-`list-colors-sort' to redisplay colors in
-the new order.
+`list-colors-sort' to redisplay colors in the new order.
 
 If the optional argument BUFFER-NAME is nil, it defaults to \"*Colors*\".
 
@@ -551,8 +550,8 @@ list-colors-display
 function to call each time the user types RET or clicks on a
 color.  The function should accept a single argument, the color name."
   (interactive)
-  (when (and (null list) (> (display-color-cells) 0))
-    (setq list (list-colors-duplicates (defined-colors)))
+  (when (> (display-color-cells) 0)
+    (setq list (list-colors-duplicates (or list (defined-colors))))
     (when list-colors-sort
       ;; Schwartzian transform with `(color key1 key2 key3 ...)'.
       (setq list (mapcar