diff --git a/src/app/buffer-change-operation.coffee b/src/app/buffer-change-operation.coffee
index eec098ce1..6fd0f2654 100644
--- a/src/app/buffer-change-operation.coffee
+++ b/src/app/buffer-change-operation.coffee
@@ -43,7 +43,6 @@ class BufferChangeOperation
     @buffer.trigger 'changed', event
     @buffer.scheduleStoppedChangingEvent()
     @buffer.updateAnchors(event)
-    @buffer.trigger 'update-anchors-after-change'
     newRange
 
   calculateNewRange: (oldRange, newText) ->
diff --git a/src/app/buffer.coffee b/src/app/buffer.coffee
index ca83bdf85..59c6bdd21 100644
--- a/src/app/buffer.coffee
+++ b/src/app/buffer.coffee
@@ -284,6 +284,7 @@ class Buffer
     anchor.pauseEvents() for anchor in anchors
     anchor.handleBufferChange(change) for anchor in anchors
     anchor.resumeEvents() for anchor in anchors
+    @trigger 'anchors-updated'
 
   matchesInCharacterRange: (regex, startIndex, endIndex) ->
     text = @getText()
diff --git a/src/app/edit-session.coffee b/src/app/edit-session.coffee
index 1c7e38f85..f8be54ae4 100644
--- a/src/app/edit-session.coffee
+++ b/src/app/edit-session.coffee
@@ -56,7 +56,7 @@ class EditSession
     @buffer.on "contents-conflicted.edit-session-#{@id}", =>
       @trigger "contents-conflicted"
 
-    @buffer.on "update-anchors-after-change.edit-session-#{@id}", =>
+    @buffer.on "anchors-updated.edit-session-#{@id}", =>
       @mergeCursors()
 
     @preserveCursorPositionOnBufferReload()