diff --git a/src/app/edit-session.coffee b/src/app/edit-session.coffee
index 7f29e0498..d9dc348ba 100644
--- a/src/app/edit-session.coffee
+++ b/src/app/edit-session.coffee
@@ -167,6 +167,14 @@ class EditSession
   pasteText: ->
     @insertText($native.readFromPasteboard())
 
+  undo: ->
+    if ranges = @buffer.undo()
+      @setSelectedBufferRanges(ranges)
+
+  redo: ->
+    if ranges = @buffer.redo()
+      @setSelectedBufferRanges(ranges)
+
   foldSelection: ->
     selection.fold() for selection in @getSelections()
 
diff --git a/src/app/editor.coffee b/src/app/editor.coffee
index 0bd70f441..086fb9c24 100644
--- a/src/app/editor.coffee
+++ b/src/app/editor.coffee
@@ -749,18 +749,12 @@ class Editor extends View
   scanInRange: (args...) -> @buffer.scanInRange(args...)
   backwardsScanInRange: (args...) -> @buffer.backwardsScanInRange(args...)
 
-
   cutSelection: -> @activeEditSession.cutSelectedText()
   copySelection: -> @activeEditSession.copySelectedText()
   paste: -> @activeEditSession.pasteText()
 
-  undo: ->
-    if ranges = @buffer.undo()
-      @setSelectedBufferRanges(ranges)
-
-  redo: ->
-    if ranges = @buffer.redo()
-      @setSelectedBufferRanges(ranges)
+  undo: -> @activeEditSession.undo()
+  redo: -> @activeEditSession.redo()
 
   destroyFold: (foldId) ->
     fold = @renderer.foldsById[foldId]