diff --git a/src/app/config.coffee b/src/app/config.coffee
index 604853326..85e5e7a47 100644
--- a/src/app/config.coffee
+++ b/src/app/config.coffee
@@ -34,6 +34,7 @@ class Config
     @requireUserInitScript()
     atom.loadThemes()
     atom.loadPackages()
+    keymap.loadUserKeymaps()
 
   loadUserConfig: ->
     if fs.exists(@configFilePath)
diff --git a/src/app/window.coffee b/src/app/window.coffee
index 3051f6016..8dd958b68 100644
--- a/src/app/window.coffee
+++ b/src/app/window.coffee
@@ -63,7 +63,6 @@ windowAdditions =
     @keymap = new Keymap()
     @keymap.bindDefaultKeys()
     @keymap.loadBundledKeymaps()
-    @keymap.loadUserKeymaps()
 
     @_handleKeyEvent = (e) => @keymap.handleKeyEvent(e)
     $(document).on 'keydown', @_handleKeyEvent