diff --git a/src/browser/application-menu.coffee b/src/browser/application-menu.coffee
index 887a9551f..a276ff5fc 100644
--- a/src/browser/application-menu.coffee
+++ b/src/browser/application-menu.coffee
@@ -162,10 +162,10 @@ class ApplicationMenu
       label: "N1"
       submenu: [
           { label: "Check for Update", metadata: {autoUpdate: true}}
-          { label: 'Reload', accelerator: 'Command+R', click: => BrowserWindow.getFocusedWindow()?.reload() }
-          { label: 'Close Window', accelerator: 'Command+Shift+W', click: => BrowserWindow.getFocusedWindow()?.close() }
-          { label: 'Toggle Dev Tools', accelerator: 'Command+Alt+I', click: => BrowserWindow.getFocusedWindow()?.toggleDevTools() }
-          { label: 'Quit', accelerator: 'Command+Q', click: -> app.quit() }
+          { label: 'Reload', accelerator: 'CmdOrCtrl+R', click: => BrowserWindow.getFocusedWindow()?.reload() }
+          { label: 'Close Window', accelerator: 'CmdOrCtrl+Shift+W', click: => BrowserWindow.getFocusedWindow()?.close() }
+          { label: 'Toggle Dev Tools', accelerator: 'CmdOrCtrl+Alt+I', click: => BrowserWindow.getFocusedWindow()?.toggleDevTools() }
+          { label: 'Quit', accelerator: 'CmdOrCtrl+Q', click: -> app.quit() }
       ]
     ]
 
diff --git a/src/menu-manager.coffee b/src/menu-manager.coffee
index fffa5dfce..5162030ee 100644
--- a/src/menu-manager.coffee
+++ b/src/menu-manager.coffee
@@ -82,8 +82,8 @@ class MenuManager
     filtered = {}
     for key, bindings of keystrokesByCommand
       for binding in bindings
-        continue if binding.indexOf(' ') != -1
-        continue unless /(cmd|ctrl|shift|alt|mod)/.test(binding)
+        continue unless binding.indexOf(' ') is -1
+        continue unless /(cmd|ctrl|shift|alt|mod)/.test(binding) or /f\d+/.test(binding)
         filtered[key] ?= []
         filtered[key].push(binding)
     filtered