Replicate the destruction of selections

src/app/cursor.coffee

@@ -35,13 +35,14 @@ class Cursor
 
       @trigger 'moved', movedEvent
       @editSession.trigger 'cursor-moved', movedEvent
+    @marker.on 'destroyed', =>
+      @destroyed = true
+      @editSession.removeCursor(this)
+      @trigger 'destroyed'
     @needsAutoscroll = true
 
   destroy: ->
-    @destroyed = true
     @marker.destroy()
-    @editSession.removeCursor(this)
-    @trigger 'destroyed'
 
   changePosition: (options, fn) ->
     @goalColumn = null

src/app/selection.coffee

@@ -18,16 +18,13 @@ class Selection
   constructor: ({@cursor, @marker, @editSession, @goalBufferRange}) ->
     @cursor.selection = this
     @marker.on 'changed', => @screenRangeChanged()
-    @cursor.on 'destroyed.selection', =>
-      @cursor = null
-      @destroy()
+    @marker.on 'destroyed', =>
+      @destroyed = true
+      @editSession.removeSelection(this)
+      @trigger 'destroyed' unless @editSession.destroyed
 
   destroy: ->
-    return if @destroyed
-    @destroyed = true
-    @editSession.removeSelection(this)
-    @trigger 'destroyed' unless @editSession.destroyed
-    @cursor?.destroy()
+    @marker.destroy()
 
   finalize: ->
     @initialScreenRange = null unless @initialScreenRange?.isEqual(@getScreenRange())