diff --git a/src/app/keymaps/editor.coffee b/src/app/keymaps/editor.coffee
index 63fc4a548..4ff9ca96a 100644
--- a/src/app/keymaps/editor.coffee
+++ b/src/app/keymaps/editor.coffee
@@ -5,7 +5,6 @@ window.keymap.bindKeys '.editor',
   'shift-up': 'select-up'
   'shift-down': 'select-down'
   'meta-a': 'select-all'
-  'ctrl-w': 'select-word'
   'enter': 'newline'
   'meta-enter': 'newline-below'
   'tab': 'tab'
@@ -33,3 +32,5 @@ window.keymap.bindKeys '.editor',
   'meta-+': 'increase-font-size'
   'meta--': 'decrease-font-size'
   'meta-/': 'toggle-line-comments'
+  'ctrl-w w': 'focus-next-pane'
+  'ctrl-W': 'select-word'
diff --git a/src/app/root-view.coffee b/src/app/root-view.coffee
index 44423707b..b04ae057d 100644
--- a/src/app/root-view.coffee
+++ b/src/app/root-view.coffee
@@ -59,6 +59,7 @@ class RootView extends View
 
     @on 'increase-font-size', => @setFontSize(@getFontSize() + 1)
     @on 'decrease-font-size', => @setFontSize(@getFontSize() - 1)
+    @on 'focus-next-pane', => @focusNextPane()
 
   afterAttach: (onDom) ->
     @focus() if onDom