diff --git a/keymaps/default.cson b/keymaps/default.cson
index 1b5aa25fe..5edae0d75 100644
--- a/keymaps/default.cson
+++ b/keymaps/default.cson
@@ -164,6 +164,8 @@
 '.tool-panel':
   'escape': 'core:close'
 
+'.tool-panel.panel-left, .tool-panel.panel-right':
+  'escape': 'tool-panel:unfocus'
 
 '.editor !important, .editor.mini !important':
   'escape': 'editor:consolidate-selections'