diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 21a243988..bcc2de429 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -6767,7 +6767,7 @@ When called with a prefix argument, include all archive files as well."
 	      ;; show tags used for filtering in a custom face
 	      (if (or org-agenda-filter (get 'org-agenda-filter
 					     :preset-filter))
-		  '(:eval (propertize
+		  '(:eval (org-propertize
 			   (concat " {"
 				   (mapconcat
 				    'identity
diff --git a/lisp/org-faces.el b/lisp/org-faces.el
index 519c858cf..7c66c89d1 100644
--- a/lisp/org-faces.el
+++ b/lisp/org-faces.el
@@ -673,10 +673,9 @@ month and 365.24 days for a year)."
   :group 'org-faces)
 
 (defface org-agenda-filter-tags
-  (org-compatible-face nil
-    '((((background light)) (:foreground "orange"))
-      (((background dark))  (:foreground "orange"))))
-  "Face for showing the tags (in the mode-line) which are used in the agenda filtering."
+  (org-compatible-face 'default
+    nil)
+  "Face for tag(s) in the mode-line when filtering the agenda."
   :group 'org-faces)
 
 (defface org-time-grid ;; originally copied from font-lock-variable-name-face