diff --git a/src/git-repository.coffee b/src/git-repository.coffee
index d523b562f..c4a9d34f5 100644
--- a/src/git-repository.coffee
+++ b/src/git-repository.coffee
@@ -96,7 +96,8 @@ class GitRepository
       @subscriptions.add new Disposable(-> window.removeEventListener 'focus', onWindowFocus)
 
     if @project?
-      @subscriptions.add @project.eachBuffer (buffer) => @subscribeToBuffer(buffer)
+      @project.getBuffers().forEach (buffer) => @subscribeToBuffer(buffer)
+      @subscriptions.add @project.onDidAddBuffer (buffer) => @subscribeToBuffer(buffer)
 
   # Public: Destroy this {GitRepository} object.
   #
diff --git a/src/project.coffee b/src/project.coffee
index b15f32615..a54d5edd1 100644
--- a/src/project.coffee
+++ b/src/project.coffee
@@ -118,6 +118,9 @@ class Project extends Model
   onDidChangePaths: (callback) ->
     @emitter.on 'did-change-paths', callback
 
+  onDidAddBuffer: (callback) ->
+    @emitter.on 'did-add-buffer', callback
+
   on: (eventName) ->
     if eventName is 'path-changed'
       Grim.deprecate("Use Project::onDidChangePaths instead")
@@ -436,6 +439,7 @@ class Project extends Model
     @buffers.splice(index, 0, buffer)
     @subscribeToBuffer(buffer)
     @emit 'buffer-created', buffer
+    @emitter.emit 'did-add-buffer', buffer
     buffer
 
   # Removes a {TextBuffer} association from the project.