diff --git a/browser/main/NoteList/index.js b/browser/main/NoteList/index.js
index ae018c9e5..e413c647d 100644
--- a/browser/main/NoteList/index.js
+++ b/browser/main/NoteList/index.js
@@ -282,8 +282,8 @@ class NoteList extends React.Component {
       ee.emit('detail:focus')
     }
 
-    // F or S key
-    if (e.keyCode === 70 || e.keyCode === 83) {
+    // L or S key
+    if (e.keyCode === 76 || e.keyCode === 83) {
       e.preventDefault()
       ee.emit('top:focus-search')
     }
diff --git a/lib/main-menu.js b/lib/main-menu.js
index ddf5ee54e..e1e2a83af 100644
--- a/lib/main-menu.js
+++ b/lib/main-menu.js
@@ -252,10 +252,20 @@ const view = {
     },
     {
       label: 'Focus Search',
-      accelerator: 'Control+S',
+      accelerator: 'CommandOrControl+Shift+L',
       click () {
         mainWindow.webContents.send('top:focus-search')
       }
+    },
+    {
+      type: 'separator'
+    },
+    {
+      label: 'Toggle Full Screen',
+      accelerator: macOS ? 'Command+Control+F' : 'F11',
+      click () {
+        mainWindow.setFullScreen(!mainWindow.isFullScreen())
+      }
     }
   ]
 }
@@ -265,7 +275,7 @@ let editorFocused
 // Define extra shortcut keys
 mainWindow.webContents.on('before-input-event', (event, input) => {
   // Synonyms for Search (Find)
-  if (input.control && input.key === 'f' && input.type === 'keyDown') {
+  if (input.control && input.key === 'l' && input.type === 'keyDown') {
     if (!editorFocused) {
       mainWindow.webContents.send('top:focus-search')
       event.preventDefault()
@@ -285,11 +295,6 @@ const window = {
       accelerator: 'Command+M',
       selector: 'performMiniaturize:'
     },
-    {
-      label: 'Toggle Full Screen',
-      accelerator: 'Command+Control+F',
-      selector: 'toggleFullScreen:'
-    },
     {
       label: 'Close',
       accelerator: 'Command+W',