2 files changed, 2 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 22d3d816b35..18dba595537 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -7,6 +7,7 @@
         (Custom-reset-standard): Fix y-or-n-p messages.
         (custom-link): New face for links.
         (custom-buffer-create-internal, custom-manual): Use it.
+        (custom-face-save): Push to theme-face before setting face spec.
 
         * wid-edit.el (widget-default-mouse-face-get): New function.
         (widget-specify-button): Handle mouse-face like button-face.
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index 678fc71f621..98c343c4db8 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -3435,6 +3435,7 @@ Optional EVENT is the location for the menu."
       (setq comment nil)
       ;; Make the comment invisible by hand if it's empty
       (custom-comment-hide comment-widget))
+    (custom-push-theme 'theme-face symbol 'user 'set value)
     (if (face-spec-choose value)
         (face-spec-set symbol value)
       ;; face-set-spec ignores empty attribute lists, so just give it
@@ -3442,7 +3443,6 @@ Optional EVENT is the location for the menu."
       (face-spec-set symbol '((t :foreground unspecified))))
     (unless (eq (widget-get widget :custom-state) 'standard)
       (put symbol 'saved-face value))
-    (custom-push-theme 'theme-face symbol 'user 'set value)
     (put symbol 'customized-face nil)
     (put symbol 'face-comment comment)
     (put symbol 'customized-face-comment nil)