diff --git a/main/index.js b/main/index.js
index 6dffc2e7..bcfdb8fe 100644
--- a/main/index.js
+++ b/main/index.js
@@ -3,8 +3,8 @@ var startTime = Date.now()
 var electron = require('electron')
 var ipc = require('./ipc')
 var menu = require('./menu')
-var windows = require('./windows')
 var shortcuts = require('./shortcuts')
+var windows = require('./windows')
 
 var app = electron.app
 
@@ -13,8 +13,8 @@ app.startTime = startTime
 
 app.on('ready', function () {
   menu.init()
-  windows.createMainWindow(menu)
-  shortcuts.init(menu, windows)
+  windows.createMainWindow()
+  shortcuts.init()
 })
 
 app.on('open-file', onOpen)
diff --git a/main/shortcuts.js b/main/shortcuts.js
index 806a64d6..2db315a3 100644
--- a/main/shortcuts.js
+++ b/main/shortcuts.js
@@ -4,10 +4,12 @@ module.exports = {
 
 var electron = require('electron')
 var localShortcut = require('electron-localshortcut')
+var menu = require('./menu')
+var windows = require('./windows')
 
 var globalShortcut = electron.globalShortcut
 
-function init (menu, windows) {
+function init () {
   // Special "media key" for play/pause, available on some keyboards
   globalShortcut.register('MediaPlayPause', () => windows.main.send('dispatch', 'playPause'))
 
diff --git a/main/windows.js b/main/windows.js
index 0e8a1ea7..d6311967 100644
--- a/main/windows.js
+++ b/main/windows.js
@@ -6,10 +6,11 @@ var windows = module.exports = {
 var config = require('../config')
 var debug = require('debug')('webtorrent-app:windows')
 var electron = require('electron')
+var menu = require('./menu')
 
 var app = electron.app
 
-function createMainWindow (menu) {
+function createMainWindow () {
   var win = windows.main = new electron.BrowserWindow({
     autoHideMenuBar: true, // Hide top menu bar unless Alt key is pressed (Windows, Linux)
     backgroundColor: '#282828',