diff --git a/src/routes/_components/NavShortcuts.html b/src/routes/_components/NavShortcuts.html
index 5087d59a..f31d9c37 100644
--- a/src/routes/_components/NavShortcuts.html
+++ b/src/routes/_components/NavShortcuts.html
@@ -5,7 +5,7 @@
 <Shortcut key="g n" on:pressed="goto('/notifications')"/>
 <Shortcut key="g c" on:pressed="goto('/community')"/>
 <Shortcut key="g d" on:pressed="goto('/direct')"/>
-<Shortcut key="s" on:pressed="goto('/search')"/>
+<Shortcut key="s|/" on:pressed="goto('/search')"/>
 <Shortcut key="h|?" on:pressed="showShortcutHelpDialog()"/>
 <Shortcut key="c|7" on:pressed="showComposeDialog()"/>
 {#if !$leftRightChangesFocus}
diff --git a/tests/spec/024-shortcuts-navigation.js b/tests/spec/024-shortcuts-navigation.js
index 149ad2f6..208b8658 100644
--- a/tests/spec/024-shortcuts-navigation.js
+++ b/tests/spec/024-shortcuts-navigation.js
@@ -60,6 +60,14 @@ test('Shortcut s goes to the search page', async t => {
     .expect(getUrl()).contains('/search')
 })
 
+test('Shortcut / goes to the search page', async t => {
+  await loginAsFoobar(t)
+  await t
+    .expect(getUrl()).eql('http://localhost:4002/')
+    .pressKey('/')
+    .expect(getUrl()).contains('/search')
+})
+
 test('Shortcut backspace goes back from favorites', async t => {
   await loginAsFoobar(t)
   await t