diff --git a/spec/app/buffer-spec.coffee b/spec/app/buffer-spec.coffee
index 125298cf6..6478a1e7b 100644
--- a/spec/app/buffer-spec.coffee
+++ b/spec/app/buffer-spec.coffee
@@ -299,6 +299,17 @@ describe 'Buffer', ->
         buffer = new Buffer
         expect(-> buffer.save()).toThrow()
 
+  describe "reload()", ->
+    it "loads text from disk are sets @modified and @modifiedOnDisk to false", ->
+      buffer.modified = true
+      buffer.modifiedOnDisk = true
+      buffer.setText("abc")
+
+      buffer.reload()
+      expect(buffer.modifed).toBeFalsy()
+      expect(buffer.modifiedOnDisk).toBeFalsy()
+      expect(buffer.getText()).toBe(fileContents)
+
   describe ".saveAs(path)", ->
     filePath = null
 
diff --git a/src/app/buffer.coffee b/src/app/buffer.coffee
index 867c97ec2..b8838c505 100644
--- a/src/app/buffer.coffee
+++ b/src/app/buffer.coffee
@@ -33,6 +33,11 @@ class Buffer
   destroy: ->
     @file?.off()
 
+  reload: ->
+    @setText(fs.read(@file.getPath()))
+    @modified = false
+    @modifiedOnDisk = false
+
   getPath: ->
     @file?.getPath()