diff --git a/core/ui/SideBarLists.tid b/core/ui/SideBarLists.tid
index 79ff61241..9d3e93830 100644
--- a/core/ui/SideBarLists.tid
+++ b/core/ui/SideBarLists.tid
@@ -1,23 +1,34 @@
 title: $:/core/ui/SideBarLists
 
 <div class="tw-sidebar-lists">
-	<div class="tw-search">
-		<$edit-text tiddler="$:/temp/search" type="search" tag="input"/>
-		<$reveal state="$:/temp/search" type="nomatch" text="">
-			<$linkcatcher to="$:/temp/search">
-				<$link to="" class="btn-invisible">{{$:/core/images/close-button}}</$link>
-			</$linkcatcher>
-		</$reveal>
-		<$reveal state="$:/temp/search" type="match" text="">&nbsp;<$link to="$:/AdvancedSearch" tooltip={{$:/language/Buttons/AdvancedSearch/Hint}} aria-label={{$:/language/Buttons/AdvancedSearch/Caption}} class="btn-invisible">&hellip;</$link>
-		</$reveal>
-	</div>
-	<$reveal state="$:/temp/search" type="nomatch" text="">
-		<div class="tw-search-results">
-			{{$:/language/Search/Matches}}
-			<$list filter="[!is[system]search{$:/temp/search}sort[title]limit[250]]" template="$:/core/ui/ListItemTemplate"/>
-		</div>
-	</$reveal>
-	<$reveal state="$:/temp/search" type="match" text="">
-		<<tabs "[all[shadows+tiddlers]tag[$:/tags/SideBar]!has[draft.of]]" "$:/core/ui/SideBar/Open" "$:/state/tab/sidebar">>
-	</$reveal>
+
+<div class="tw-search">
+<$edit-text tiddler="$:/temp/search" type="search" tag="input"/>
+<$reveal state="$:/temp/search" type="nomatch" text="">
+<$linkcatcher to="$:/temp/search">
+<$link to="" class="btn-invisible">{{$:/core/images/close-button}}</$link>
+</$linkcatcher>
+</$reveal>
+<$reveal state="$:/temp/search" type="match" text="">&nbsp;<$link to="$:/AdvancedSearch" tooltip={{$:/language/Buttons/AdvancedSearch/Hint}} aria-label={{$:/language/Buttons/AdvancedSearch/Caption}} class="btn-invisible">&hellip;</$link>
+</$reveal>
+</div>
+
+<$reveal state="$:/temp/search" type="nomatch" text="">
+
+<div class="tw-search-results">
+
+{{$:/language/Search/Matches}}
+
+<$list filter="[!is[system]search{$:/temp/search}sort[title]limit[250]]" template="$:/core/ui/ListItemTemplate"/>
+
+</div>
+
+</$reveal>
+
+<$reveal state="$:/temp/search" type="match" text="">
+
+<<tabs "[all[shadows+tiddlers]tag[$:/tags/SideBar]!has[draft.of]]" "TableOfContents" "$:/state/tab/sidebar">>
+
+</$reveal>
+
 </div>
diff --git a/core/wiki/macros/tabs.tid b/core/wiki/macros/tabs.tid
index cd5ed50f9..013aaba45 100644
--- a/core/wiki/macros/tabs.tid
+++ b/core/wiki/macros/tabs.tid
@@ -4,19 +4,23 @@ tags: $:/tags/Macro
 \define tabs(tabsList,default,state:"$:/state/tab",class)
 <div class="tw-tab-set $class$">
 <div class="tw-tab-buttons $class$">
-	<$list filter="$tabsList$" variable="currentTab">
-		<$button set=<<qualify "$state$">> setTo=<<currentTab>> default="$default$" selectedClass="tw-tab-selected">
-			<$transclude tiddler=<<currentTab>> field="caption">
-			<$macrocall $name="currentTab" $type="text/plain" $output="text/plain"/>
-			</$transclude>
-		</$button>
-	</$list>
+<$list filter="$tabsList$" variable="currentTab">
+<$button set=<<qualify "$state$">> setTo=<<currentTab>> default="$default$" selectedClass="tw-tab-selected">
+<$transclude tiddler=<<currentTab>> field="caption">
+<$macrocall $name="currentTab" $type="text/plain" $output="text/plain"/>
+</$transclude>
+</$button>
+</$list>
 </div><div class="tw-tab-divider $class$"/><div class="tw-tab-content $class$">
-	<$list filter="$tabsList$" variable="currentTab">
-		<$reveal type="match" state=<<qualify "$state$">> text=<<currentTab>> default="$default$">
-			<$transclude tiddler=<<currentTab>> mode="block"/>
-		</$reveal>
-	</$list>
+<$list filter="$tabsList$" variable="currentTab">
+
+<$reveal type="match" state=<<qualify "$state$">> text=<<currentTab>> default="$default$">
+
+<$transclude tiddler=<<currentTab>> mode="block"/>
+
+</$reveal>
+
+</$list>
 </div>
 </div>
 \end