diff --git a/lib/app.tsx b/lib/app.tsx
index 1b9df7a2b..8062179ff 100644
--- a/lib/app.tsx
+++ b/lib/app.tsx
@@ -210,7 +210,10 @@ export const App = connect(
         return false;
       }
 
-      if (cmdOrCtrl && shiftKey && 'KeyS' === code) {
+      if (
+        (cmdOrCtrl && shiftKey && 'KeyS' === code) ||
+        (isElectron && cmdOrCtrl && !shiftKey && 'KeyF' === code)
+      ) {
         this.props.focusSearchField();
 
         event.stopPropagation();