diff --git a/src/app/editor.coffee b/src/app/editor.coffee
index 438fa8979..049e501b3 100644
--- a/src/app/editor.coffee
+++ b/src/app/editor.coffee
@@ -103,9 +103,9 @@ class Editor extends View
       'core:select-down': @selectDown
       'core:select-left': @selectLeft
       'core:select-right': @selectRight
-      'select-to-top': @selectToTop
-      'select-to-bottom': @selectToBottom
-      'select-all': @selectAll
+      'core:select-to-top': @selectToTop
+      'core:select-to-bottom': @selectToBottom
+      'core:select-all': @selectAll
       'backspace': @backspace
       'delete': @delete
       'undo': @undo
diff --git a/src/app/keymaps/apple.coffee b/src/app/keymaps/apple.coffee
index 775d12e33..f418dbc29 100644
--- a/src/app/keymaps/apple.coffee
+++ b/src/app/keymaps/apple.coffee
@@ -1,14 +1,14 @@
 window.keymap.bindKeys 'body'
   'meta-up': 'core:move-to-top'
   'meta-down': 'core:move-to-bottom'
+  'meta-shift-up': 'core:select-to-top'
+  'meta-shift-down': 'core:select-to-bottom'
 
 window.keymap.bindKeys '.editor'
   'meta-right': 'move-to-end-of-line'
   'meta-left': 'move-to-beginning-of-line'
   'alt-left': 'move-to-beginning-of-word'
   'alt-right': 'move-to-end-of-word'
-  'meta-shift-up': 'select-to-top'
-  'meta-shift-down': 'select-to-bottom'
   'meta-shift-left': 'select-to-beginning-of-line'
   'meta-shift-right': 'select-to-end-of-line'
   'alt-shift-left': 'select-to-beginning-of-word'
diff --git a/src/app/keymaps/atom.coffee b/src/app/keymaps/atom.coffee
index 895a0aebc..71ecac8af 100644
--- a/src/app/keymaps/atom.coffee
+++ b/src/app/keymaps/atom.coffee
@@ -9,6 +9,7 @@ window.keymap.bindKeys 'body'
   'shift-down': 'core:select-down'
   'shift-left': 'core:select-left'
   'shift-right': 'core:select-right'
+  'meta-a': 'core:select-all'
   pageup: 'core:page-up'
   pagedown: 'core:page-down'
   'meta-S': 'save-all'
diff --git a/src/app/keymaps/editor.coffee b/src/app/keymaps/editor.coffee
index 86e761550..d28eba19a 100644
--- a/src/app/keymaps/editor.coffee
+++ b/src/app/keymaps/editor.coffee
@@ -1,6 +1,5 @@
 window.keymap.bindKeys '.editor',
   'meta-s': 'save'
-  'meta-a': 'select-all'
   'enter': 'newline'
   'meta-enter': 'newline-below'
   'tab': 'indent'