diff --git a/src/app/editor.coffee b/src/app/editor.coffee
index 1e6bad3a2..49e52e002 100644
--- a/src/app/editor.coffee
+++ b/src/app/editor.coffee
@@ -386,9 +386,6 @@ class Editor extends View
 
     @activeEditSession = @editSessions[index]
 
-    if @activeEditSession.buffer.isInConflict()
-      @showBufferConflictAlert(@activeEditSession)
-
     @activeEditSession.on "buffer-contents-change-on-disk", =>
       @showBufferConflictAlert(@activeEditSession)
 
@@ -398,6 +395,9 @@ class Editor extends View
     @trigger 'editor-path-change'
     @renderWhenAttached()
 
+    if @attached and @activeEditSession.buffer.isInConflict()
+      @showBufferConflictAlert(@activeEditSession)
+
   showBufferConflictAlert: (editSession) ->
     message = editSession.getPath()
     detailedMessage = "Has changed on disk. Do you want to reload it?"