diff --git a/src/app/keymaps/atom.coffee b/src/app/keymaps/atom.coffee
index 1eaac678c..6ca9d46d4 100644
--- a/src/app/keymaps/atom.coffee
+++ b/src/app/keymaps/atom.coffee
@@ -30,4 +30,5 @@ window.keymap.bindKeys 'body'
   'alt-meta-i': 'toggle-dev-tools'
 
 window.keymap.bindKeys '.tool-panel'
-  'escape': 'tool-panel:unfocus'
+  'meta-escape': 'tool-panel:unfocus'
+  'escape': 'core:close'
diff --git a/src/extensions/command-panel/src/keymap.coffee b/src/extensions/command-panel/src/keymap.coffee
index 06c19b6d0..18bf0b6c7 100644
--- a/src/extensions/command-panel/src/keymap.coffee
+++ b/src/extensions/command-panel/src/keymap.coffee
@@ -1,7 +1,6 @@
 window.keymap.bindKeys '*'
-  'ctrl-0': 'command-panel:toggle'
-  'ctrl-2': 'command-panel:toggle-preview'
-  'meta-:': 'command-panel:toggle'
+  'meta-:': 'command-panel:toggle-preview'
+  'meta-;': 'command-panel:toggle'
   'meta-F': 'command-panel:find-in-project'
 
 window.keymap.bindKeys '.command-panel .preview-list, .command-panel .editor input',
diff --git a/src/extensions/event-palette/src/keymap.coffee b/src/extensions/event-palette/src/keymap.coffee
index 3a033a0e6..46c6b2aed 100644
--- a/src/extensions/event-palette/src/keymap.coffee
+++ b/src/extensions/event-palette/src/keymap.coffee
@@ -1,5 +1,5 @@
 window.keymap.bindKeys 'body, .event-palette .editor'
-  'ctrl-enter': 'event-palette:toggle'
+  'meta-p': 'event-palette:toggle'
 
 window.keymap.bindKeys '.event-palette .editor'
-  'ctrl-enter': 'event-palette:toggle'
+  'meta-p': 'event-palette:toggle'
diff --git a/src/extensions/markdown-preview/src/keymap.coffee b/src/extensions/markdown-preview/src/keymap.coffee
index a2849b093..58c9a7042 100644
--- a/src/extensions/markdown-preview/src/keymap.coffee
+++ b/src/extensions/markdown-preview/src/keymap.coffee
@@ -1,5 +1,5 @@
 window.keymap.bindKeys '.editor',
-  'meta-P': 'markdown-preview:toggle'
+  'meta-m': 'markdown-preview:toggle'
 
 window.keymap.bindKeys '.markdown-preview',
-  'meta-P': 'markdown-preview:toggle'
+  'meta-m': 'markdown-preview:toggle'
diff --git a/src/extensions/outline-view/src/keymap.coffee b/src/extensions/outline-view/src/keymap.coffee
index 46344df44..330815ac9 100644
--- a/src/extensions/outline-view/src/keymap.coffee
+++ b/src/extensions/outline-view/src/keymap.coffee
@@ -1,2 +1,2 @@
 window.keymap.bindKeys '.editor'
-  'ctrl-o': 'outline-view:toggle'
+  'meta-j': 'outline-view:toggle'
diff --git a/src/extensions/tree-view/src/keymap.coffee b/src/extensions/tree-view/src/keymap.coffee
index 4280b2de7..d87689b68 100644
--- a/src/extensions/tree-view/src/keymap.coffee
+++ b/src/extensions/tree-view/src/keymap.coffee
@@ -1,6 +1,6 @@
 window.keymap.bindKeys '#root-view'
-  'ctrl-1': 'tree-view:toggle'
-  'ctrl-meta-1': 'tree-view:reveal-active-file'
+  'meta-\\': 'tree-view:toggle'
+  'meta-|': 'tree-view:reveal-active-file'
 
 window.keymap.bindKeys '.tree-view'
   'right': 'tree-view:expand-directory'