diff --git a/src/app/keymap.coffee b/src/app/keymap.coffee
index 949c23f24..fbd3e9fa5 100644
--- a/src/app/keymap.coffee
+++ b/src/app/keymap.coffee
@@ -30,15 +30,6 @@ class Keymap
     @bindingSetsByFirstKeystroke = {}
 
   bindDefaultKeys: ->
-    @add
-      'body':
-        'meta-n': 'new-window'
-        'meta-,': 'open-user-configuration'
-        'meta-o': 'open'
-        'meta-O': 'open-dev'
-        'meta-w': 'core:close'
-        'alt-meta-i': 'toggle-dev-tools'
-
     $(document).command 'new-window', => atom.newWindow()
     $(document).command 'open-user-configuration', => atom.openConfig()
     $(document).command 'open', => atom.open()
diff --git a/src/app/keymaps/atom.cson b/src/app/keymaps/atom.cson
index f10063bc4..820801b9a 100644
--- a/src/app/keymaps/atom.cson
+++ b/src/app/keymaps/atom.cson
@@ -52,6 +52,13 @@
   'meta-9': 'pane:show-item-9'
   'meta-T': 'pane:reopen-closed-item'
 
+  'meta-n': 'new-window'
+  'meta-,': 'open-user-configuration'
+  'meta-o': 'open'
+  'meta-O': 'open-dev'
+  'meta-w': 'core:close'
+  'alt-meta-i': 'toggle-dev-tools'
+
 '.tool-panel':
   'meta-escape': 'tool-panel:unfocus'
   'escape': 'core:close'