diff --git a/core/language/en-GB/Buttons.multids b/core/language/en-GB/Buttons.multids
index cddf68485..572c515d7 100644
--- a/core/language/en-GB/Buttons.multids
+++ b/core/language/en-GB/Buttons.multids
@@ -32,6 +32,7 @@ ExportTiddler/Caption: export tiddler
 ExportTiddler/Hint: Export tiddler
 ExportTiddlers/Caption: export tiddlers
 ExportTiddlers/Hint: Export tiddlers
+FocusSidebarSearch/Hint: Focus the sidebar search field
 Fold/Caption: fold tiddler
 Fold/Hint: Fold the body of this tiddler
 Fold/FoldBar/Caption: fold-bar
diff --git a/core/ui/KeyboardShortcuts/focus-sidebar-search.tid b/core/ui/KeyboardShortcuts/focus-sidebar-search.tid
new file mode 100644
index 000000000..e7441e0b1
--- /dev/null
+++ b/core/ui/KeyboardShortcuts/focus-sidebar-search.tid
@@ -0,0 +1,5 @@
+title: $:/core/ui/KeyboardShortcuts/focus-sidebar-search
+tags: $:/tags/KeyboardShortcut
+key: ((focus-sidebar-search))
+
+<$action-sendmessage $message="tm-focus-selector" $param=".tc-search input"/>
diff --git a/core/wiki/config/ShortcutInfo.multids b/core/wiki/config/ShortcutInfo.multids
index 8bf424a66..7d2c35062 100644
--- a/core/wiki/config/ShortcutInfo.multids
+++ b/core/wiki/config/ShortcutInfo.multids
@@ -3,6 +3,7 @@ title: $:/config/ShortcutInfo/
 bold: {{$:/language/Buttons/Bold/Hint}}
 cancel-edit-tiddler: {{$:/language/Buttons/Cancel/Hint}}
 excise: {{$:/language/Buttons/Excise/Hint}}
+focus-sidebar-search: {{$:/language/Buttons/FocusSidebarSearch/Hint}}
 heading-1: {{$:/language/Buttons/Heading1/Hint}}
 heading-2: {{$:/language/Buttons/Heading2/Hint}}
 heading-3: {{$:/language/Buttons/Heading3/Hint}}
diff --git a/core/wiki/config/shortcuts/shortcuts.multids b/core/wiki/config/shortcuts/shortcuts.multids
index 9c135b4d4..db1633b61 100644
--- a/core/wiki/config/shortcuts/shortcuts.multids
+++ b/core/wiki/config/shortcuts/shortcuts.multids
@@ -2,6 +2,7 @@ title: $:/config/shortcuts/
 
 cancel-edit-tiddler: escape
 excise: ctrl-E
+focus-sidebar-search: ctrl-shift-F
 heading-1: ctrl-1
 heading-2: ctrl-2
 heading-3: ctrl-3