diff --git a/lisp/org.el b/lisp/org.el
index 653b1a655..63ab7185f 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -13695,10 +13695,11 @@ Returns the new tags string, or nil to not change the current settings."
 		  (condition-case nil
 		      (setq tg (org-icompleting-read
 				"Tag: "
-				(append (or buffer-tags
-					    (with-current-buffer buf
-					      (org-get-buffer-tags)))
-					(mapcar 'car table))))
+				(delete-dups
+				 (append (or buffer-tags
+					     (with-current-buffer buf
+					       (mapcar 'car (org-get-buffer-tags))))
+					 (mapcar 'car table)))))
 		    (quit (setq tg "")))
 		  (when (string-match "\\S-" tg)
 		    (add-to-list 'buffer-tags (list tg))