diff --git a/core/templates/TagTemplate.tid b/core/templates/TagTemplate.tid
index b6d506feb..020da5f15 100644
--- a/core/templates/TagTemplate.tid
+++ b/core/templates/TagTemplate.tid
@@ -1,5 +1,16 @@
 title: $:/templates/TagTemplate
 
 {{label{
-<<color background:yes default:#888><<<view title>>>>
+<<color background:yes default:#888><
+<<button toggle:MyTiddler on:open off:closed qualifyTiddlerTitles:yes><
+<<view title>>
+>>
+>>
 }}}
+<<reveal state:MyTiddler qualifyTiddlerTitles:yes><
+<div class="open">
+{{dropdown-menu{
+<<list tagging>>
+}}}
+</div>
+>>