diff --git a/core/data/System/WebCreateNewTopicTemplate.txt b/core/data/System/WebCreateNewTopicTemplate.txt
index ddac4259aa..4eb9c16223 100644
--- a/core/data/System/WebCreateNewTopicTemplate.txt
+++ b/core/data/System/WebCreateNewTopicTemplate.txt
@@ -59,7 +59,7 @@
 
 %TMPL:DEF{"topicparent"}%%IF{"defined pickparent" then="<select name='topicparent' size='10' class='foswikiSelect'>$percentTOPICLIST{$quot<option $marker value='$name'>$name</option>$quot marker=$quotselected=\$quotselected\$quot$quot separator=$quot$quot selection=$quot$percentURLPARAM{ $quottopicparent$quot default=$quot%MAKETEXT{"(no parent, orphaned topic)"}%$quot }$percent$quot}$percent<option value=$quot$quot>$percentMAKETEXT{$quot(no parent, orphaned topic)$quot}$percent</option></select>" else="<input type='text' size='40' name='topicparent' class='foswikiInputField' value='%URLPARAM{topicparent}%' />&nbsp;<span class='foswikiUnvisited'><a id='pickparent' href='$percentSCRIPTURLPATH{view}$percent/$percentBASEWEB$percent/$percentBASETOPIC$percent?pickparent=1;$percentQUERYSTRING$percent;#NewTopic'>%MAKETEXT{"Pick from a list"}%</a></span>"}%%TMPL:END%
 
-%TMPL:DEF{"topictemplate"}%<select name="templatetopic" class="foswikiSelect">%IF{"'%URLPARAM{"templatetopic"}%'" then='<option selected="selected">%URLPARAM{"templatetopic"}%</option>'}%<option value="">%MAKETEXT{"Default template"}%</option>%SEARCH{"name~'*Template'" scope="topic" web="%BASEWEB%" excludetopic="*EditTemplate,*WebCreateNewTopicTemplate,*ViewTemplate" type="query" nonoise="on" format="<option value=\"$web.$topic\">$topic</option>"}%</select>%SEARCH{"name~'*Template'" scope="topic" web="%BASEWEB%" limit="1" excludetopic="WebTopicEditTemplate,*WebCreateNewTopicTemplate,*ViewTemplate" type="query" nonoise="on" format=" <span class='foswikiUnvisited'><a id='viewtemplates' href='%SCRIPTURL{view}%/%SYSTEMWEB%/WebTemplateTopics?web=%BASEWEB%'>%MAKETEXT{"View templates"}%</a></span>"}% %TMPL:END%
+%TMPL:DEF{"topictemplate"}%<select name="templatetopic" class="foswikiSelect">%IF{"'%URLPARAM{"templatetopic"}%'" then='<option selected="selected">%URLPARAM{"templatetopic"}%</option>'}%<option value="">%MAKETEXT{"Default template"}%</option>%SEARCH{"name~'*Template'" scope="topic" topic="*Template" web="%BASEWEB%" excludetopic="*EditTemplate,*WebCreateNewTopicTemplate,*ViewTemplate" type="query" nonoise="on" format="<option value=\"$web.$topic\">$topic</option>"}%</select>%SEARCH{"name~'*Template'" scope="topic" topic="*Template" web="%BASEWEB%" limit="1" excludetopic="WebTopicEditTemplate,*WebCreateNewTopicTemplate,*ViewTemplate" type="query" nonoise="on" format=" <span class='foswikiUnvisited'><a id='viewtemplates' href='%SCRIPTURL{view}%/%SYSTEMWEB%/WebTemplateTopics?web=%BASEWEB%'>%MAKETEXT{"View templates"}%</a></span>"}% %TMPL:END%
 
 %TMPL:DEF{"submit"}%<input id="submit" type="submit" class="foswikiSubmit" value='%MAKETEXT{"Create this topic"}%' />%TMPL:END%
 
diff --git a/core/data/System/WebTemplateTopics.txt b/core/data/System/WebTemplateTopics.txt
index 4baa801859..8408410845 100644
--- a/core/data/System/WebTemplateTopics.txt
+++ b/core/data/System/WebTemplateTopics.txt
@@ -5,4 +5,4 @@
 *%MAKETEXT{"A topic template defines the initial content of a newly created topic."}%*
 
 %MAKETEXT{"Available templates in [_1] Web:" args="%URLPARAM{"web" default="%WEB%"}%"}%
-%SEARCH{"name~'*Template'" scope="topic" web="%URLPARAM{"web" default="%WEB%"}%" excludetopic="WebTopicEditTemplate,*WebCreateNewTopicTemplate,*ViewTemplate" type="query" nosearch="on" nonoise="on" format="   * [[$web.$topic][$topic]]"}%
\ No newline at end of file
+%SEARCH{"name~'*Template'" scope="topic" topic="*Template" web="%URLPARAM{"web" default="%WEB%"}%" excludetopic="WebTopicEditTemplate,*WebCreateNewTopicTemplate,*ViewTemplate" type="query" nosearch="on" nonoise="on" format="   * [[$web.$topic][$topic]]"}%