diff --git a/lisp/org.el b/lisp/org.el
index 57a8d61e8..6f898c470 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -14118,7 +14118,7 @@ When DOWNCASE is non-nil, expand downcased TAGS."
 	    (setq rpl (append (org-uniquify rpl) (assoc tag tal)))
 	    (setq rtnmatch
 		  (replace-match
-		   (concat dir "{" (regexp-opt rpl) "}") t t rtnmatch))))
+		   (concat dir "{\\<" (regexp-opt rpl) "\\>}") t t rtnmatch))))
 	(if single-as-list
 	    (or (reverse rpl) (list rtnmatch))
 	  rtnmatch))