diff --git a/core/wiki/macros/tag-picker.tid b/core/wiki/macros/tag-picker.tid
index ce7738df0..67194a147 100644
--- a/core/wiki/macros/tag-picker.tid
+++ b/core/wiki/macros/tag-picker.tid
@@ -14,7 +14,7 @@ tags: $:/tags/Macro
 </$button>
 \end
 
-\define tag-picker()
+\define tag-picker-inner()
 <div class="tc-edit-add-tag">
 <span class="tc-add-tag-name">
 <$keyboard key="ENTER" actions=<<add-tag-actions>>>
@@ -48,3 +48,10 @@ tags: $:/tags/Macro
 </$reveal>
 </div>
 \end
+\define tag-picker()
+<$list filter="[<newTagNameTiddler>match[]]" emptyMessage=<<tag-picker>>>
+<$set name="newTagNameTiddler" value=<<qualify "$:/temp/NewTagName">>>
+<<tag-picker>>
+</$set>
+</$list>
+\end