diff --git a/spec/app/editor-spec.coffee b/spec/app/editor-spec.coffee
index e666cc1e6..d8eb7a744 100644
--- a/spec/app/editor-spec.coffee
+++ b/spec/app/editor-spec.coffee
@@ -1596,7 +1596,7 @@ describe "Editor", ->
         expect(miniEditor.find('.line.cursor-line').length).toBe 0
 
 
-  fdescribe "gutter line highlighting", ->
+  describe "gutter line highlighting", ->
     beforeEach ->
       editor.attachToDom(heightInLines: 5.5)
 
diff --git a/src/app/editor.coffee b/src/app/editor.coffee
index 39ec9190e..f74693356 100644
--- a/src/app/editor.coffee
+++ b/src/app/editor.coffee
@@ -344,7 +344,7 @@ class Editor extends View
         @gutter.addClass('drop-shadow')
 
     @on 'cursor-move', => @highlightCursorLine()
-    @on 'editor-selection-change', => @highlightCursorLine()
+    @on 'selection-change', => @highlightCursorLine()
 
   selectOnMousemoveUntilMouseup: ->
     moveHandler = (e) => @selectToScreenPosition(@screenPositionFromMouseEvent(e))
@@ -419,7 +419,7 @@ class Editor extends View
       @trigger 'editor-path-change'
 
     @activeEditSession.getSelection().on 'change-screen-range', =>
-      @trigger 'editor-selection-change'
+      @trigger 'selection-change'
 
     @trigger 'editor-path-change'
     @renderWhenAttached()
diff --git a/src/app/gutter.coffee b/src/app/gutter.coffee
index 12b65f957..0361de79f 100644
--- a/src/app/gutter.coffee
+++ b/src/app/gutter.coffee
@@ -19,7 +19,7 @@ class Gutter extends View
     editor = @editor()
     highlightCursorLine = => @highlightCursorLine()
     editor.on 'cursor-move', highlightCursorLine
-    editor.on 'editor-selection-change', highlightCursorLine
+    editor.on 'selection-change', highlightCursorLine
     @calculateWidth()
 
   editor: ->