diff --git a/package.json b/package.json
index 221004c12..25f7fb0e1 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,7 @@
   "electronVersion": "0.30.7",
   "dependencies": {
     "async": "0.2.6",
-    "atom-keymap": "^6.0.0",
+    "atom-keymap": "^6.1.0",
     "babel-core": "^5.8.21",
     "bootstrap": "^3.3.4",
     "clear-cut": "^2.0.1",
diff --git a/spec/spec-helper.coffee b/spec/spec-helper.coffee
index 61ae8148e..b14c5d4a3 100644
--- a/spec/spec-helper.coffee
+++ b/spec/spec-helper.coffee
@@ -96,7 +96,6 @@ beforeEach ->
     assert: atom.assert.bind(atom)
   })
   atom.themes.workspace = atom.workspace
-  atom.keymaps.keyBindings = _.clone(keyBindingsToRestore)
   atom.commands.restoreSnapshot(commandsToRestore)
   atom.styles.restoreSnapshot(styleElementsToRestore)
   atom.views.clearDocumentRequests()
diff --git a/src/atom-environment.coffee b/src/atom-environment.coffee
index e613361f8..a0eb4fe6f 100644
--- a/src/atom-environment.coffee
+++ b/src/atom-environment.coffee
@@ -227,6 +227,9 @@ class AtomEnvironment extends Model
     @config.reset()
     @setConfigSchema()
 
+    @keymaps.clear()
+    @keymaps.loadBundledKeymaps()
+
   ###
   Section: Event Subscription
   ###