diff --git a/spec/app/edit-session-spec.coffee b/spec/app/edit-session-spec.coffee
index a03989c04..c4bd0ddff 100644
--- a/spec/app/edit-session-spec.coffee
+++ b/spec/app/edit-session-spec.coffee
@@ -7,10 +7,14 @@ describe "EditSession", ->
   beforeEach ->
     fakeEditor =
       calcSoftWrapColumn: ->
-      tabText: '  '
 
     buffer = new Buffer(require.resolve('fixtures/sample.js'))
-    editSession = new EditSession(editor: fakeEditor, buffer: buffer, autoIndent: false)
+    editSession = new EditSession(
+      editor: fakeEditor
+      buffer: buffer
+      tabText: '  '
+      autoIndent: false
+    )
     lineLengths = buffer.getLines().map (line) -> line.length
 
   describe "cursor movement", ->
diff --git a/spec/app/selection-spec.coffee b/spec/app/selection-spec.coffee
index 1d53e50be..aa3133461 100644
--- a/spec/app/selection-spec.coffee
+++ b/spec/app/selection-spec.coffee
@@ -9,8 +9,7 @@ describe "Selection", ->
     buffer = new Buffer(require.resolve('fixtures/sample.js'))
     fakeEditor =
       calcSoftWrapColumn: ->
-      tabText: '  '
-    editSession = new EditSession(editor: fakeEditor, buffer: buffer)
+    editSession = new EditSession(editor: fakeEditor, buffer: buffer, tabText: '  ')
     selection = editSession.getSelection()
 
   describe ".deleteSelectedText()", ->
diff --git a/src/app/edit-session.coffee b/src/app/edit-session.coffee
index 90f1de063..ebbdfe789 100644
--- a/src/app/edit-session.coffee
+++ b/src/app/edit-session.coffee
@@ -15,6 +15,7 @@ class EditSession
     session = new EditSession(
       editor: editor
       buffer: buffer
+      tabText: editor.tabText
       autoIndent: editor.autoIndent
       softTabs: editor.softTabs
     )
@@ -31,10 +32,9 @@ class EditSession
   autoIndent: true
   softTabs: true
 
-  constructor: ({@editor, @buffer, @autoIndent}) ->
+  constructor: ({@editor, @buffer, @tabText, @autoIndent}) ->
     @id = @constructor.idCounter++
-    @tabText = @editor.tabText
-    @renderer = new Renderer(@buffer, { softWrapColumn: @editor.calcSoftWrapColumn(), tabText: @editor.tabText })
+    @renderer = new Renderer(@buffer, { softWrapColumn: @editor.calcSoftWrapColumn(), tabText: @tabText })
     @cursors = []
     @selections = []
     @addCursorAtScreenPosition([0, 0])
diff --git a/src/app/editor.coffee b/src/app/editor.coffee
index be30a52c0..de213b50a 100644
--- a/src/app/editor.coffee
+++ b/src/app/editor.coffee
@@ -354,7 +354,13 @@ class Editor extends View
     index = @editSessionIndexForBuffer(buffer)
     unless index?
       index = @editSessions.length
-      @editSessions.push(new EditSession(editor: this, buffer: buffer, autoIndent: @autoIndent, softTabs: @softTabs))
+      @editSessions.push(new EditSession(
+        editor: this
+        buffer: buffer
+        tabText: @tabText
+        autoIndent: @autoIndent
+        softTabs: @softTabs
+      ))
 
     @setActiveEditSessionIndex(index)