diff --git a/spec/app/pane-spec.coffee b/spec/app/pane-spec.coffee
index 6004ced05..3c249e749 100644
--- a/spec/app/pane-spec.coffee
+++ b/spec/app/pane-spec.coffee
@@ -50,6 +50,7 @@ describe "Pane", ->
           pane.showItem(editSession2)
           expect(pane.itemViews.find('.editor').length).toBe 1
           editor = pane.itemViews.find('.editor').view()
+          expect(editor.css('display')).toBe ''
           expect(editor.activeEditSession).toBe editSession2
 
     describe "when showing a view item", ->
diff --git a/src/app/editor.coffee b/src/app/editor.coffee
index 1bc4ed8db..fc69b0c37 100644
--- a/src/app/editor.coffee
+++ b/src/app/editor.coffee
@@ -160,7 +160,6 @@ class Editor extends View
         'core:select-down': @selectDown
         'core:select-to-top': @selectToTop
         'core:select-to-bottom': @selectToBottom
-        'core:close': @destroyActiveEditSession
         'editor:save': @save
         'editor:save-as': @saveAs
         'editor:newline-below': @insertNewlineBelow
@@ -172,7 +171,6 @@ class Editor extends View
         'editor:fold-current-row': @foldCurrentRow
         'editor:unfold-current-row': @unfoldCurrentRow
         'editor:fold-selection': @foldSelection
-        'editor:show-next-buffer': @loadNextEditSession
         'editor:show-buffer-1': => @setActiveEditSessionIndex(0) if @editSessions[0]
         'editor:show-buffer-2': => @setActiveEditSessionIndex(1) if @editSessions[1]
         'editor:show-buffer-3': => @setActiveEditSessionIndex(2) if @editSessions[2]
@@ -182,7 +180,6 @@ class Editor extends View
         'editor:show-buffer-7': => @setActiveEditSessionIndex(6) if @editSessions[6]
         'editor:show-buffer-8': => @setActiveEditSessionIndex(7) if @editSessions[7]
         'editor:show-buffer-9': => @setActiveEditSessionIndex(8) if @editSessions[8]
-        'editor:show-previous-buffer': @loadPreviousEditSession
         'editor:toggle-line-comments': @toggleLineCommentsInSelection
         'editor:log-cursor-scope': @logCursorScope
         'editor:checkout-head-revision': @checkoutHead
diff --git a/src/app/keymaps/atom.cson b/src/app/keymaps/atom.cson
index d2a16ebff..d3427fb45 100644
--- a/src/app/keymaps/atom.cson
+++ b/src/app/keymaps/atom.cson
@@ -31,6 +31,10 @@
   'ctrl-meta-f': 'window:toggle-full-screen'
 
 '.pane':
+  'meta-{': 'pane:show-previous-item'
+  'meta-}': 'pane:show-next-item'
+  'alt-meta-left': 'pane:show-previous-item'
+  'alt-meta-right': 'pane:show-next-item'
   'ctrl-|': 'pane:split-right'
   'ctrl-w v': 'pane:split-right'
   'ctrl--': 'pane:split-down'
diff --git a/src/app/keymaps/editor.cson b/src/app/keymaps/editor.cson
index b072a462b..e30e84e9b 100644
--- a/src/app/keymaps/editor.cson
+++ b/src/app/keymaps/editor.cson
@@ -18,10 +18,6 @@
   'shift-tab': 'editor:outdent-selected-rows'
   'meta-[': 'editor:outdent-selected-rows'
   'meta-]': 'editor:indent-selected-rows'
-  'meta-{': 'editor:show-previous-buffer'
-  'meta-}': 'editor:show-next-buffer'
-  'alt-meta-left': 'editor:show-previous-buffer'
-  'alt-meta-right': 'editor:show-next-buffer'
   'meta-1': 'editor:show-buffer-1'
   'meta-2': 'editor:show-buffer-2'
   'meta-3': 'editor:show-buffer-3'