diff --git a/lisp/faces.el b/lisp/faces.el
index df099787698..bb9b1e979fa 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -1107,6 +1107,16 @@ returned.  Otherwise, DEFAULT is returned verbatim."
   (let ((prompt (if default
                     (format-prompt prompt default)
                   (format "%s: " prompt)))
+        (completion-extra-properties
+         '(:affixation-function
+           (lambda (faces)
+             (mapcar
+              (lambda (face)
+                (list (concat (propertize "SAMPLE" 'face face)
+                              "\t")
+                      ""
+                      face))
+              faces))))
         aliasfaces nonaliasfaces faces)
     ;; Build up the completion tables.
     (mapatoms (lambda (s)
diff --git a/lisp/hi-lock.el b/lisp/hi-lock.el
index b77f9181a9c..081b604d5b2 100644
--- a/lisp/hi-lock.el
+++ b/lisp/hi-lock.el
@@ -727,11 +727,11 @@ with completion and history."
 			   (cdr (member last-used-face hi-lock-face-defaults))
 			   hi-lock-face-defaults))
 	 face)
-          (if (and hi-lock-auto-select-face (not current-prefix-arg))
+    (if (and hi-lock-auto-select-face (not current-prefix-arg))
 	(setq face (or (pop hi-lock--unused-faces) (car defaults)))
-      (setq face (completing-read
-		  (format-prompt "Highlight using face" (car defaults))
-		  obarray 'facep t nil 'face-name-history defaults))
+      (setq face (read-face-name
+                  (format-prompt "Highlight using face" (car defaults))
+                  defaults))
       ;; Update list of un-used faces.
       (setq hi-lock--unused-faces (remove face hi-lock--unused-faces))
       ;; Grow the list of defaults.