diff --git a/core/ui/AdvancedSearch.tid b/core/ui/AdvancedSearch.tid
new file mode 100644
index 000000000..ad30ed820
--- /dev/null
+++ b/core/ui/AdvancedSearch.tid
@@ -0,0 +1,3 @@
+title: $:/AdvancedSearch
+
+<div class="tw-advanced-search"><<tabs "[is[shadow]!has[draft.of]tag[$:/tags/AdvancedSearch]] [!is[shadow]!has[draft.of]tag[$:/tags/AdvancedSearch]] +[tag[$:/tags/AdvancedSearch]]" "$:/core/ui/AdvancedSearch/System">></div>
diff --git a/core/ui/AdvancedSearch/Shadows.tid b/core/ui/AdvancedSearch/Shadows.tid
new file mode 100644
index 000000000..73d5be102
--- /dev/null
+++ b/core/ui/AdvancedSearch/Shadows.tid
@@ -0,0 +1,27 @@
+title: $:/core/ui/AdvancedSearch/Shadows
+tags: $:/tags/AdvancedSearch
+caption: Shadows
+
+<$linkcatcher to="$:/temp/advancedsearch">
+
+Search for shadow tiddlers:
+
+<div class="tw-search"><$edit-text tiddler="$:/temp/advancedsearch" type="search" tag="input"/><$reveal state="$:/temp/advancedsearch" type="nomatch" text=""> <$link to="" class="btn-invisible">{{$:/core/images/close-button}}</$link></$reveal></div>
+
+</$linkcatcher>
+
+<$reveal state="$:/temp/advancedsearch" type="nomatch" text="">
+
+<div class="tw-search-results">
+
+//<small><$count filter="[is[shadow]search{$:/temp/advancedsearch}]"/> matches</small>//
+
+<$list filter="[is[shadow]search{$:/temp/advancedsearch}sort[title]limit[250]]" template="$:/core/ui/ListItemTemplate"/>
+
+</div>
+
+</$reveal>
+
+<$reveal state="$:/temp/advancedsearch" type="match" text="">
+
+</$reveal>
diff --git a/core/ui/AdvancedSearch/System.tid b/core/ui/AdvancedSearch/System.tid
new file mode 100644
index 000000000..6d017b67f
--- /dev/null
+++ b/core/ui/AdvancedSearch/System.tid
@@ -0,0 +1,27 @@
+title: $:/core/ui/AdvancedSearch/System
+tags: $:/tags/AdvancedSearch
+caption: System
+
+<$linkcatcher to="$:/temp/advancedsearch">
+
+Search for system tiddlers:
+
+<div class="tw-search"><$edit-text tiddler="$:/temp/advancedsearch" type="search" tag="input"/><$reveal state="$:/temp/advancedsearch" type="nomatch" text=""> <$link to="" class="btn-invisible">{{$:/core/images/close-button}}</$link></$reveal></div>
+
+</$linkcatcher>
+
+<$reveal state="$:/temp/advancedsearch" type="nomatch" text="">
+
+<div class="tw-search-results">
+
+//<small><$count filter="[search{$:/temp/advancedsearch}]"/> matches</small>//
+
+<$list filter="[search{$:/temp/advancedsearch}sort[title]limit[250]]" template="$:/core/ui/ListItemTemplate"/>
+
+</div>
+
+</$reveal>
+
+<$reveal state="$:/temp/advancedsearch" type="match" text="">
+
+</$reveal>
diff --git a/core/ui/SideBar/Tools.tid b/core/ui/SideBar/Tools.tid
index 1c8febe88..2a8423c9e 100644
--- a/core/ui/SideBar/Tools.tid
+++ b/core/ui/SideBar/Tools.tid
@@ -6,6 +6,10 @@ caption: Tools
 
 ---
 
+[[AdvancedSearch|$:/AdvancedSearch]]
+
+---
+
 {{$:/snippets/minithemeswitcher}}
 
 ---
diff --git a/core/wiki/advancedsearch.tid b/core/wiki/advancedsearch.tid
new file mode 100644
index 000000000..6cf0d31c8
--- /dev/null
+++ b/core/wiki/advancedsearch.tid
@@ -0,0 +1,2 @@
+title: $:/temp/advancedsearch
+