diff --git a/src/editor.coffee b/src/editor.coffee
index eae977746..428392f56 100644
--- a/src/editor.coffee
+++ b/src/editor.coffee
@@ -450,7 +450,9 @@ class Editor extends Model
       else
         confirmed = true
 
-      repo.checkoutHead(filePath) if confirmed
+      if confirmed
+        @buffer.reload() if @buffer.isModified()
+        repo.checkoutHead(filePath)
 
   # Copies the current file path to the native clipboard.
   copyPathToClipboard: ->