diff --git a/spec/app/editor-spec.coffee b/spec/app/editor-spec.coffee
index cc1cfe814..64bcaa8a3 100644
--- a/spec/app/editor-spec.coffee
+++ b/spec/app/editor-spec.coffee
@@ -1657,12 +1657,11 @@ describe "Editor", ->
       beforeEach ->
         editor.attachToDom(30)
 
-      it "doesn't highlight the backround", ->
+      it "doesn't highlight the background or the gutter", ->
         editor.getSelection().setBufferRange(new Range([0,0],[2,0]))
         expect(editor.getSelection().isSingleScreenLine()).toBe false
-        expect(editor.find('.line-number.cursor-line-number').length).toBe 1
+        expect(editor.find('.line-number.cursor-line-number').length).toBe 0
         expect(editor.find('.line-number.cursor-line-number.cursor-line-number-background').length).toBe 0
-        expect(editor.find('.line-number.cursor-line-number').text()).toBe "3"
 
     it "when a newline is deleted with backspace, the line number of the new cursor position is highlighted", ->
       editor.setCursorScreenPosition([1,0])
diff --git a/src/app/gutter.coffee b/src/app/gutter.coffee
index 0361de79f..feeb6ea1b 100644
--- a/src/app/gutter.coffee
+++ b/src/app/gutter.coffee
@@ -66,7 +66,7 @@ class Gutter extends View
     currentLineNumberRow.removeClass('cursor-line-number')
     currentLineNumberRow.removeClass('cursor-line-number-background')
 
-    newLineNumberRow = @find(".line-number:eq(#{screenRowIndex})")
-    newLineNumberRow.addClass('cursor-line-number')
     if @editor().getSelection().isSingleScreenLine()
+      newLineNumberRow = @find(".line-number:eq(#{screenRowIndex})")
+      newLineNumberRow.addClass('cursor-line-number')
       newLineNumberRow.addClass('cursor-line-number-background')