diff --git a/core/wiki/macros/toc.tid b/core/wiki/macros/toc.tid
index 8fa9a5c77..fb01d57ec 100644
--- a/core/wiki/macros/toc.tid
+++ b/core/wiki/macros/toc.tid
@@ -42,24 +42,26 @@ The very first toc macro is _not_ reused. So it can be used as a simple referenc
 
 \procedure toc-newChildButton()
 	\procedure _newChild(field:"parent")
-	<$button actions=<<__actions>> tooltip=`New Child -> "$(field)$: $(currentTiddler)$"`
+	<$button tooltip=`New Child -> "$(field)$: $(currentTiddler)$"`
 		aria-label="new child here" class="tc-btn-invisible"
 	>
-		<$action-sendmessage $message="tm-new-tiddler" $name=<<field>> $value=<<currentTiddler>>/>
-		<% if [<_mode>match[tagLikeMode]] %>
-			{{$:/core/images/new-here-button}}
-		<% else %>
+		<% if [<_mode>match[tocpMode]] %>
+			<$action-sendmessage $message="tm-new-tiddler" $name=<<field>> $value=<<currentTiddler>>/>
 			{{$:/wikilabs/images/new-child-alone}}
+		<% else %>
+			<$action-sendmessage $message="tm-new-tiddler" $name=<<field>> $value={{{[<currentTiddler>format:titlelist[]]}}}/>
+			{{$:/core/images/new-here-button}}
 		<% endif %>
 	</$button>
 	\end _newChild
 
 	<% if [<tv-toc-show-new-child>match[yes]] %>
 		<% if [<_mode>match[tagMode]] %>
-			<span class="tc-small-gap-left">{{||$:/core/ui/Buttons/new-here}}</span>
+			<span class="tc-small-gap-left"><$macrocall $name="_newChild" field="tags"/></span>
+			<!-- <span class="tc-small-gap-left">{{||$:/core/ui/Buttons/new-here}}</span> -->
 		<% elseif [<_mode>match[tocpMode]] %>
 			<span class="tc-small-gap-left"><$macrocall $name="_newChild" field=<<parentField>>/></span>
-		<% elseif [<_mode>match[tagLikeMode]] %>
+		<% elseif [<_mode>match[tagLikeModeXXX]] %>
 			<span class="tc-small-gap-left"><$macrocall $name="_newChild" field=<<tagField>>/></span>
 		<% endif %>
 	<% endif %>