1 files changed, 6 insertions, 6 deletions

diff --git a/lisp/org/org-agenda.el b/lisp/org/org-agenda.el
index 8dd31c8e481..eaa250584ef 100644
--- a/lisp/org/org-agenda.el
+++ b/lisp/org/org-agenda.el
@@ -4984,12 +4984,12 @@ the new TODO state."
                                 (if line (point-at-eol) nil) t)
         (add-text-properties
          (match-beginning 2) (match-end 2)
-         (list 'face (delq nil (adjoin 'org-tag
-                                       (let ((prop (get-text-property
-                                                    (match-beginning 2) 'face)))
-                                         (if (listp prop)
-                                             prop
-                                           (list prop)))))))
+         (list 'face (delq nil (let ((prop (get-text-property
+                                            (match-beginning 2) 'face)))
+                                 (or (listp prop) (setq prop (list prop)))
+                                 (if (memq 'org-tag prop)
+                                     prop
+                                   (cons 'org-tag prop))))))
         (setq l (- (match-end 2) (match-beginning 2))
               c (if (< org-agenda-tags-column 0)
                     (- (abs org-agenda-tags-column) l)