diff --git a/src/app/cursor-view.coffee b/src/app/cursor-view.coffee
index 1c1a4fcfa..90a1f1e34 100644
--- a/src/app/cursor-view.coffee
+++ b/src/app/cursor-view.coffee
@@ -20,20 +20,20 @@ class CursorView extends View
     @cursor.on 'change-screen-position.cursor-view', (screenPosition, { bufferChange, autoscroll }) =>
       @needsUpdate = true
       @needsAutoscroll = (autoscroll ? true) and @cursor?.isLastCursor()
-      @editor.updateDisplay()
+      @editor.requestDisplayUpdate()
 
       # TODO: Move idle/active to the cursor model
-      @removeIdleClassTemporarily() unless bufferChange
+#       @removeIdleClassTemporarily() unless bufferChange
       @trigger 'cursor-move', {bufferChange}
 
     @cursor.on 'change-visibility.cursor-view', (visible) =>
       @needsUpdate = true
       @needsAutoscroll = visible and @cursor.isLastCursor()
-      @editor.updateDisplay()
+      @editor.requestDisplayUpdate()
 
     @cursor.on 'destroy.cursor-view', =>
       @needsRemoval = true
-      @editor.updateDisplay()
+      @editor.requestDisplayUpdate()
 
   remove: ->
     @editor.removeCursorView(this)
diff --git a/src/app/editor.coffee b/src/app/editor.coffee
index c146d51e2..9073615d0 100644
--- a/src/app/editor.coffee
+++ b/src/app/editor.coffee
@@ -357,8 +357,6 @@ class Editor extends View
       else
         @gutter.addClass('drop-shadow')
 
-    @on 'selection-change', => @highlightCursorLine()
-
   selectOnMousemoveUntilMouseup: ->
     moveHandler = (e) => @selectToScreenPosition(@screenPositionFromMouseEvent(e))
     @on 'mousemove', moveHandler
@@ -377,7 +375,7 @@ class Editor extends View
     @hiddenInput.width(@charWidth)
     @setSoftWrapColumn() if @activeEditSession.getSoftWrap()
     @invisibles = @rootView()?.getInvisibles()
-    $(window).on "resize.editor#{@id}", => @updateDisplay()
+    $(window).on "resize.editor#{@id}", => @requestDisplayUpdate()
     @focus() if @isFocused
 
     @resetDisplay()
@@ -465,7 +463,7 @@ class Editor extends View
     return if scrollTop == @cachedScrollTop
     @cachedScrollTop = scrollTop
 
-    @updateDisplay() if @attached and !@updatingDisplay
+    @requestDisplayUpdate() if @attached
 
     @renderedLines.css('top', -scrollTop)
     @underlayer.css('top', -scrollTop)
@@ -530,7 +528,7 @@ class Editor extends View
           element.removeClass('selected')
 
   setScrollPositionFromActiveEditSession: ->
-    @scrollTop(@activeEditSession.scrollTop ? 0, updateDisplay: false)
+    @scrollTop(@activeEditSession.scrollTop ? 0)
     @scrollView.scrollLeft(@activeEditSession.scrollLeft ? 0)
 
   saveActiveEditSession: ->
@@ -581,7 +579,7 @@ class Editor extends View
       @calculateDimensions()
       @updatePaddingOfRenderedLines()
       @updateLayerDimensions()
-      @updateDisplay()
+      @requestDisplayUpdate()
 
   newSplitEditor: ->
     new Editor { editSession: @activeEditSession.copy(), @showInvisibles }
@@ -725,7 +723,7 @@ class Editor extends View
     @activeEditSession.on 'add-selection', (selection) =>
       @newCursors.push(selection.cursor)
       @newSelections.push(selection)
-      @updateDisplay(autoscroll: true)
+      @requestDisplayUpdate()
 
     @activeEditSession.on 'screen-lines-change', (e) => @handleDisplayBufferChange(e)
 
@@ -733,15 +731,20 @@ class Editor extends View
     @newSelections = @activeEditSession.getSelections()
     @updateDisplay(suppressAutoScroll: true)
 
+  requestDisplayUpdate: ()->
+    return if @pendingDisplayUpdate
+    @pendingDisplayUpdate = true
+    webkitRequestAnimationFrame =>
+      @updateDisplay()
+      @pendingDisplayUpdate = false
+
   updateDisplay: (options={}) ->
-    throw new Error("Re-entry into updateDisplay") if @updatingDisplay
-    @updatingDisplay = true
     return unless @attached
     @updateCursorViews()
     @updateSelectionViews()
     @autoscroll(options)
     @updateRenderedLines()
-    @updatingDisplay = false
+    @highlightCursorLine()
 
   updateCursorViews: ->
     if @newCursors.length > 0
@@ -797,8 +800,7 @@ class Editor extends View
     @lastRenderedScreenRow = renderTo
     @updateLayerDimensions()
     @updatePaddingOfRenderedLines()
-    @gutter.renderLineNumbers(@firstRenderedScreenRow, @lastRenderedScreenRow)
-    @highlightCursorLine()
+#     @gutter.renderLineNumbers(@firstRenderedScreenRow, @lastRenderedScreenRow)
 
   computeIntactRanges: ->
     return [] if !@firstRenderedScreenRow? and !@lastRenderedScreenRow?
@@ -903,7 +905,7 @@ class Editor extends View
     to = oldRange.end.row
     delta = newRange.end.row - oldRange.end.row
     @pendingChanges.push({from, to, delta})
-    @updateDisplay()
+    @requestDisplayUpdate()
 
   buildLineElementForScreenRow: (screenRow) ->
     div = document.createElement('div')
diff --git a/src/app/selection-view.coffee b/src/app/selection-view.coffee
index 169b6ca44..6ebe70eca 100644
--- a/src/app/selection-view.coffee
+++ b/src/app/selection-view.coffee
@@ -13,10 +13,10 @@ class SelectionView extends View
 
   initialize: ({@editor, @selection} = {}) ->
     @regions = []
-    @selection.on 'change-screen-range', => @updateDisplay()
+    @selection.on 'change-screen-range', => @editor.requestDisplayUpdate()
     @selection.on 'destroy', =>
       @destroyed = true
-      @editor.updateDisplay()
+      @editor.requestDisplayUpdate()
 
   updateDisplay: ->
     @clearRegions()