diff --git a/core/ui/EditorToolbar/link-dropdown.tid b/core/ui/EditorToolbar/link-dropdown.tid
index 16099a88b..ad0464956 100644
--- a/core/ui/EditorToolbar/link-dropdown.tid
+++ b/core/ui/EditorToolbar/link-dropdown.tid
@@ -6,20 +6,28 @@ title: $:/core/ui/EditorToolbar/link-dropdown
 <$action-sendmessage
 	$message="tm-edit-text-operation"
 	$param="make-link"
-	text={{$:/temp/mytemp}}
+	text={{$(linkTiddler)$}}
 />
 
 <$action-deletetiddler
 	$tiddler=<<dropdown-state>>
 />
+
+<$action-deletetiddler
+	$tiddler=<<searchTiddler>>
+/>
+
+<$action-deletetiddler
+	$tiddler=<<linkTiddler>>
+/>
 \end
 
+\define body(config-title)
 ''<<lingo Hint>>''
 
-<$set name="searchTiddler" value="$:/temp/search">
+<$vars searchTiddler="""$config-title$/search""" linkTiddler="""$config-title$/link""">
 
-
-<$edit-text tiddler=<<searchTiddler>> type="search" tag="input" focus="true" placeholder={{$:/language/Search/Search}}/>
+<$edit-text tiddler=<<searchTiddler>> type="search" tag="input" focus="true" placeholder={{$:/language/Search/Search}} default=""/>
 <$reveal tag="span" state=<<searchTiddler>> type="nomatch" text="">
 <$button class="tc-btn-invisible" style="width: auto; display: inline-block; background-colour: inherit;">
 <$action-setfield $tiddler=<<searchTiddler>> text="" />
@@ -29,7 +37,7 @@ title: $:/core/ui/EditorToolbar/link-dropdown
 
 <$reveal tag="div" state=<<searchTiddler>> type="nomatch" text="">
 
-<$linkcatcher actions=<<link-actions>> to="$:/temp/mytemp">
+<$linkcatcher actions=<<link-actions>> to=<<linkTiddler>>>
 
 {{$:/core/ui/SearchResults}}
 
@@ -37,4 +45,8 @@ title: $:/core/ui/EditorToolbar/link-dropdown
 
 </$reveal>
 
-</$set>
+</$vars>
+
+\end
+
+<$macrocall $name="body" config-title=<<qualify "$:/state/Link/">>/>