diff --git a/src/app/editor.coffee b/src/app/editor.coffee
index fef62d757..da15ea5f8 100644
--- a/src/app/editor.coffee
+++ b/src/app/editor.coffee
@@ -777,6 +777,7 @@ class Editor extends View
     @updatePaddingOfRenderedLines()
     @adjustMinWidthOfRenderedLines()
     @gutter.renderLineNumbers(@firstRenderedScreenRow, @lastRenderedScreenRow)
+    @highlightCursorLine()
 #     @handleScrollHeightChange()
 
   computeIntactRanges: ->
@@ -951,8 +952,7 @@ class Editor extends View
     line.join('')
 
   lineElementForScreenRow: (screenRow) ->
-    element = @lineCache[screenRow - @firstRenderedScreenRow]
-    $(element)
+    @renderedLines.children(":eq(#{screenRow - @firstRenderedScreenRow})")
 
   logScreenLines: (start, end) ->
     @activeEditSession.logScreenLines(start, end)