diff --git a/core/ui/KeyboardShortcuts/advanced-search.tid b/core/ui/KeyboardShortcuts/advanced-search.tid
new file mode 100644
index 000000000..796814ea7
--- /dev/null
+++ b/core/ui/KeyboardShortcuts/advanced-search.tid
@@ -0,0 +1,7 @@
+title: $:/core/ui/KeyboardShortcuts/advanced-search
+key: ((advanced-search))
+
+<$navigator story="$:/StoryList" history="$:/HistoryList">
+<$action-navigate $to="$:/AdvancedSearch"/>
+<$action-sendmessage $message="tm-focus-selector" $param="""[data-tiddler-title="$:/AdvancedSearch"] .tc-search input"""/>
+</$navigator>
diff --git a/core/wiki/config/ShortcutInfo.multids b/core/wiki/config/ShortcutInfo.multids
index f08d71efd..2c67ec29e 100644
--- a/core/wiki/config/ShortcutInfo.multids
+++ b/core/wiki/config/ShortcutInfo.multids
@@ -1,9 +1,9 @@
 title: $:/config/ShortcutInfo/
 
+advanced-search: {{$:/language/Buttons/AdvancedSearch/Hint}}
 bold: {{$:/language/Buttons/Bold/Hint}}
 cancel-edit-tiddler: {{$:/language/Buttons/Cancel/Hint}}
 excise: {{$:/language/Buttons/Excise/Hint}}
-sidebar-search: {{$:/language/Buttons/SidebarSearch/Hint}}
 heading-1: {{$:/language/Buttons/Heading1/Hint}}
 heading-2: {{$:/language/Buttons/Heading2/Hint}}
 heading-3: {{$:/language/Buttons/Heading3/Hint}}
@@ -23,6 +23,7 @@ picture: {{$:/language/Buttons/Picture/Hint}}
 preview: {{$:/language/Buttons/Preview/Hint}}
 quote: {{$:/language/Buttons/Quote/Hint}}
 save-tiddler: {{$:/language/Buttons/Save/Hint}}
+sidebar-search: {{$:/language/Buttons/SidebarSearch/Hint}}
 stamp: {{$:/language/Buttons/Stamp/Hint}}
 strikethrough: {{$:/language/Buttons/Strikethrough/Hint}}
 subscript: {{$:/language/Buttons/Subscript/Hint}}
diff --git a/core/wiki/config/shortcuts/shortcuts.multids b/core/wiki/config/shortcuts/shortcuts.multids
index 11a07d560..1d192df9a 100644
--- a/core/wiki/config/shortcuts/shortcuts.multids
+++ b/core/wiki/config/shortcuts/shortcuts.multids
@@ -1,5 +1,6 @@
 title: $:/config/shortcuts/
 
+advanced-search: ctrl-shift-A
 cancel-edit-tiddler: escape
 excise: ctrl-E
 sidebar-search: ctrl-shift-F