diff --git a/core/ui/AdvancedSearch/Filter.tid b/core/ui/AdvancedSearch/Filter.tid
index f6f13a863..55de251d6 100644
--- a/core/ui/AdvancedSearch/Filter.tid
+++ b/core/ui/AdvancedSearch/Filter.tid
@@ -6,7 +6,7 @@ caption: {{$:/language/Search/Filter/Caption}}
 <<lingo Filter/Hint>>
 
 <div class="tc-search tc-advanced-search">
-<$edit-text tiddler="$:/temp/advancedsearch" type="search" tag="input"/>
+<$edit-text tiddler="$:/temp/advancedsearch" type="search" tag="input" focus={{$:/config/Search/AutoFocus}}/>
 <$list filter="[all[shadows+tiddlers]tag[$:/tags/AdvancedSearch/FilterButton]!has[draft.of]]"><$transclude/></$list>
 </div>
 
diff --git a/core/ui/AdvancedSearch/Shadows.tid b/core/ui/AdvancedSearch/Shadows.tid
index b2455bfbb..9dcf5d67e 100644
--- a/core/ui/AdvancedSearch/Shadows.tid
+++ b/core/ui/AdvancedSearch/Shadows.tid
@@ -8,7 +8,7 @@ caption: {{$:/language/Search/Shadows/Caption}}
 <<lingo Shadows/Hint>>
 
 <div class="tc-search">
-<$edit-text tiddler="$:/temp/advancedsearch" type="search" tag="input"/>
+<$edit-text tiddler="$:/temp/advancedsearch" type="search" tag="input" focus={{$:/config/Search/AutoFocus}}/>
 <$reveal state="$:/temp/advancedsearch" type="nomatch" text="">
 <$button class="tc-btn-invisible">
 <$action-setfield $tiddler="$:/temp/advancedsearch" $field="text" $value=""/>
diff --git a/core/ui/AdvancedSearch/Standard.tid b/core/ui/AdvancedSearch/Standard.tid
index 2342cb5b7..99b597205 100644
--- a/core/ui/AdvancedSearch/Standard.tid
+++ b/core/ui/AdvancedSearch/Standard.tid
@@ -8,7 +8,7 @@ caption: {{$:/language/Search/Standard/Caption}}
 <<lingo Standard/Hint>>
 
 <div class="tc-search">
-<$edit-text tiddler="$:/temp/advancedsearch" type="search" tag="input"/>
+<$edit-text tiddler="$:/temp/advancedsearch" type="search" tag="input" focus={{$:/config/Search/AutoFocus}}/>
 <$reveal state="$:/temp/advancedsearch" type="nomatch" text="">
 <$button class="tc-btn-invisible">
 <$action-setfield $tiddler="$:/temp/advancedsearch" $field="text" $value=""/>
diff --git a/core/ui/AdvancedSearch/System.tid b/core/ui/AdvancedSearch/System.tid
index 6de9d0786..c74bb26e4 100644
--- a/core/ui/AdvancedSearch/System.tid
+++ b/core/ui/AdvancedSearch/System.tid
@@ -8,7 +8,7 @@ caption: {{$:/language/Search/System/Caption}}
 <<lingo System/Hint>>
 
 <div class="tc-search">
-<$edit-text tiddler="$:/temp/advancedsearch" type="search" tag="input"/>
+<$edit-text tiddler="$:/temp/advancedsearch" type="search" tag="input" focus={{$:/config/Search/AutoFocus}}/>
 <$reveal state="$:/temp/advancedsearch" type="nomatch" text="">
 <$button class="tc-btn-invisible">
 <$action-setfield $tiddler="$:/temp/advancedsearch" $field="text" $value=""/>