diff --git a/core/ui/ViewToolbar/new-here.tid b/core/ui/ViewToolbar/new-here.tid
index df0e86690..14390dada 100644
--- a/core/ui/ViewToolbar/new-here.tid
+++ b/core/ui/ViewToolbar/new-here.tid
@@ -3,8 +3,9 @@ tags: $:/tags/ViewToolbar
 caption: {{$:/core/images/new-here-button}} {{$:/language/Buttons/NewHere/Caption}}
 description: {{$:/language/Buttons/NewHere/Hint}}
 
+\define newHereButton()
 <$button tooltip={{$:/language/Buttons/NewHere/Hint}} aria-label={{$:/language/Buttons/NewHere/Caption}} class=<<tv-config-toolbar-class>>>
-<$action-sendmessage $message="tm-new-tiddler" tags=<<currentTiddler>>/>
+<$action-sendmessage $message="tm-new-tiddler" tags="[[$(currentTiddler)$]]"/>
 <$list filter="[<tv-config-toolbar-icons>prefix[yes]]">
 {{$:/core/images/new-here-button}}
 </$list>
@@ -12,3 +13,5 @@ description: {{$:/language/Buttons/NewHere/Hint}}
 <$text text={{$:/language/Buttons/NewHere/Caption}}/>
 </$list>
 </$button>
+\end
+<<newHereButton>>
\ No newline at end of file