diff --git a/package.json b/package.json
index ce77349c0..a7aaec6e0 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,7 @@
   "atomShellVersion": "0.10.7",
   "dependencies": {
     "async": "0.2.6",
-    "atom-keymap": "^0.6.0",
+    "atom-keymap": "^0.7.0",
     "bootstrap": "git://github.com/atom/bootstrap.git#6af81906189f1747fd6c93479e3d998ebe041372",
     "clear-cut": "0.4.0",
     "coffee-script": "1.7.0",
diff --git a/src/atom.coffee b/src/atom.coffee
index 75c83fd49..5bf5b87d7 100644
--- a/src/atom.coffee
+++ b/src/atom.coffee
@@ -149,9 +149,7 @@ class Atom extends Model
     configDirPath = @getConfigDirPath()
 
     @config = new Config({configDirPath, resourcePath})
-    @keymap = new Keymap
-    @keymap.configDirPath = configDirPath
-    @keymap.resourcePath = resourcePath
+    @keymap = new Keymap({configDirPath, resourcePath})
     @packages = new PackageManager({devMode, configDirPath, resourcePath})
     @themes = new ThemeManager({packageManager: @packages, configDirPath, resourcePath})
     @contextMenu = new ContextMenuManager(devMode)