diff --git a/core/ui/EditTemplate/tags.tid b/core/ui/EditTemplate/tags.tid
index 0bc581592..d368ce491 100644
--- a/core/ui/EditTemplate/tags.tid
+++ b/core/ui/EditTemplate/tags.tid
@@ -25,6 +25,14 @@ color:$(foregroundColor)$;
 <$macrocall $name="tag-body-inner" colour="""$colour$""" fallbackTarget={{$palette$##tag-background}} colourA={{$palette$##foreground}} colourB={{$palette$##background}} icon="""$icon$"""/>
 \end
 
+\define tag-picker-actions()
+<$action-listops
+	$tiddler=<<currentTiddler>>
+	$field="tags"
+	$subfilter="[<tag>] [all[current]tags[]]"
+/>
+\end
+
 <div class="tc-edit-tags">
 <$fieldmangler>
 <$list filter="[all[current]tags[]sort[title]]" storyview="pop">
@@ -32,6 +40,6 @@ color:$(foregroundColor)$;
 </$list>
 </$fieldmangler>
 <$set name="tabIndex" value={{$:/config/EditTabIndex}}>
-<$macrocall $name="tag-picker"/>
+<$macrocall $name="tag-picker" actions=<<tag-picker-actions>>/>
 </$set>
 </div>
diff --git a/core/wiki/macros/tag-picker.tid b/core/wiki/macros/tag-picker.tid
index 952aaf0c5..8d58748f2 100644
--- a/core/wiki/macros/tag-picker.tid
+++ b/core/wiki/macros/tag-picker.tid
@@ -14,7 +14,8 @@ $(actions)$
 </$button>
 \end
 
-\define tag-picker()
+\define tag-picker(actions)
+<$set name="actions" value="""$actions$""">
 <div class="tc-edit-add-tag">
 <span class="tc-add-tag-name">
 <$keyboard key="ENTER" actions=<<add-tag-actions>>>
@@ -23,7 +24,7 @@ $(actions)$
 </span> <$button popup=<<qualify "$:/state/popup/tags-auto-complete">> class="tc-btn-invisible" tooltip={{$:/language/EditTemplate/Tags/Dropdown/Hint}} aria-label={{$:/language/EditTemplate/Tags/Dropdown/Caption}}>{{$:/core/images/down-arrow}}</$button> <span class="tc-add-tag-button">
 <$set name="tag" value={{$:/temp/NewTagName}}>
 <$button set="$:/temp/NewTagName" setTo="" class="">
-<<add-tag-actions>>
+$actions$
 <$action-deletetiddler $tiddler="$:/temp/NewTagName"/>
 {{$:/language/EditTemplate/Tags/Add/Button}}
 </$button>
@@ -45,4 +46,5 @@ $(actions)$
 </div>
 </$reveal>
 </div>
+</$set>
 \end