diff --git a/src/text-buffer.coffee b/src/text-buffer.coffee
index 9cd63361c..176d6b63b 100644
--- a/src/text-buffer.coffee
+++ b/src/text-buffer.coffee
@@ -68,22 +68,19 @@ class TextBuffer
 
   loadSync: ->
     @updateCachedDiskContentsSync()
+    @finishLoading()
+
+  load: ->
+    @updateCachedDiskContents().then => @finishLoading()
+
+  finishLoading: ->
     @loaded = true
     if @useSerializedText and @state.get('diskContentsDigest') == @file?.getDigest()
       @emitModifiedStatusChanged(true)
     else
       @reload()
     @text.clearUndoStack()
-
-  load: ->
-    @updateCachedDiskContents().then =>
-      @loaded = true
-      if @useSerializedText and @state.get('diskContentsDigest') == @file?.getDigest()
-        @emitModifiedStatusChanged(true)
-      else
-        @reload()
-      @text.clearUndoStack()
-      this
+    this
 
   ### Internal ###