diff --git a/core/ui/Components/tag-link.tid b/core/ui/Components/tag-link.tid
new file mode 100644
index 000000000..088210d48
--- /dev/null
+++ b/core/ui/Components/tag-link.tid
@@ -0,0 +1,9 @@
+title: $:/core/ui/Components/tag-link
+
+<$link>
+<$set name="backgroundColor" value={{!!color}}>
+<span style=<<tag-styles>> class="tc-tag-label">
+<$view field="title" format="text"/>
+</span>
+</$set>
+</$link>
\ No newline at end of file
diff --git a/core/ui/EditTemplate/tags.tid b/core/ui/EditTemplate/tags.tid
index f1490aec3..49bbd2efc 100644
--- a/core/ui/EditTemplate/tags.tid
+++ b/core/ui/EditTemplate/tags.tid
@@ -27,14 +27,12 @@ background-color:$(backgroundColor)$;
 <$reveal state=<<qualify "$:/state/popup/tags-auto-complete">> type="nomatch" text="" default="">
 <div class="tc-block-dropdown">
 <$linkcatcher set="$:/temp/NewTagName" setTo="" message="tm-add-tag">
-<$list filter="[!is[shadow]tags[]search{$:/temp/NewTagName}sort[title]]">
-<$link>
-<$set name="backgroundColor" value={{!!color}}>
-<span style=<<tag-styles>> class="tc-tag-label">
-<$view field="title" format="text"/>
-</span>
-</$set>
-</$link>
+<$list filter="[tags[]search:title{$:/temp/NewTagName}sort[]]">
+{{||$:/core/ui/Components/tag-link}}
+</$list>
+<hr>
+<$list filter="[!is[system]search:title{$:/temp/NewTagName}sort[]]">
+{{||$:/core/ui/Components/tag-link}}
 </$list>
 </$linkcatcher>
 </div>