diff --git a/core/templates/PageTemplate.tid b/core/templates/PageTemplate.tid
index 084d7ede5..3db5ef0cf 100644
--- a/core/templates/PageTemplate.tid
+++ b/core/templates/PageTemplate.tid
@@ -36,9 +36,11 @@ title: $:/templates/PageTemplate
 <<reveal state:[[$:/search/text]] type:nomatch text:""><
 
 <div class="open">
-<div class="dropdown-menu">
-<<list filter:"[!is[shadow]searchVia[$:/search/text]sort[title]limit[50]]" template:"$:/templates/SearchResultTemplate" emptyMessage:"//No results//">>
-</div>
+
+{{dropdown-menu{
+* <<list filter:"[!is[shadow]searchVia[$:/search/text]sort[title]limit[50]]" template:"$:/templates/SearchResultTemplate" emptyMessage:"//No results//">>
+}}}
+
 </div>
 
 >>
diff --git a/core/templates/SearchResultTemplate.tid b/core/templates/SearchResultTemplate.tid
index da3d36b8a..ecc722479 100644
--- a/core/templates/SearchResultTemplate.tid
+++ b/core/templates/SearchResultTemplate.tid
@@ -1,3 +1,3 @@
 title: $:/templates/SearchResultTemplate
 
-<<view title link>>
\ No newline at end of file
+<li><<view title link>></li>
\ No newline at end of file
diff --git a/core/templates/TagTemplate.tid b/core/templates/TagTemplate.tid
index 5267a9530..5658e543e 100644
--- a/core/templates/TagTemplate.tid
+++ b/core/templates/TagTemplate.tid
@@ -10,15 +10,22 @@ title: $:/templates/TagTemplate
 >>
 }}}
 <<reveal state:TagDropDownLocation type:popup qualifyTiddlerTitles:yes><
+
 <div class="open">
-<div class="dropdown-menu">
-<<view title link>>
-<div class="divider"></div>
-(((
+
+{{dropdown-menu{
+
+* <<view title link>>
+*{{divider}} 
+
+* (((
 
 [is[current]tagging[]]
 
-)) <<view title link>> )
-</div>
+)) <li><<view title link>></li> )
+
+}}}
+
 </div>
+
 >>