diff --git a/src/app/keymap.coffee b/src/app/keymap.coffee
index ab9b70d07..1918a429d 100644
--- a/src/app/keymap.coffee
+++ b/src/app/keymap.coffee
@@ -28,6 +28,12 @@ class Keymap
     $(document).command 'open', => atom.open()
     $(document).command 'open-unstable', => atom.openUnstable()
 
+  loadBundledKeymaps: ->
+    @loadDirectory(require.resolve('keymaps'))
+
+  loadUserKeymaps: ->
+    @loadDirectory(fs.join(config.configDirPath, 'keymaps'))
+
   loadDirectory: (directoryPath) ->
     @load(filePath) for filePath in fs.list(directoryPath)
 
diff --git a/src/app/window.coffee b/src/app/window.coffee
index 4d0b6e6a7..b7988eba8 100644
--- a/src/app/window.coffee
+++ b/src/app/window.coffee
@@ -60,7 +60,8 @@ windowAdditions =
 
     @keymap = new Keymap()
     @keymap.bindDefaultKeys()
-    @keymap.loadDirectory(require.resolve('keymaps'))
+    @keymap.loadBundledKeymaps()
+    @keymap.loadUserKeymaps()
 
     @_handleKeyEvent = (e) => @keymap.handleKeyEvent(e)
     $(document).on 'keydown', @_handleKeyEvent