diff --git a/src/text-editor-presenter.coffee b/src/text-editor-presenter.coffee
index 4ff358cec..59ff21afe 100644
--- a/src/text-editor-presenter.coffee
+++ b/src/text-editor-presenter.coffee
@@ -314,16 +314,9 @@ class TextEditorPresenter
       Math.ceil(@model.getScreenLineCount() / linesPerTile),
       Math.ceil(@endRow / linesPerTile) + @tileOverdrawMargin
     )
-    visibleTilesIndexes = [startIndex...endIndex]
 
-    for index, tile of @state.content.tiles
-      continue if index is @scrollingTile
-      continue if startIndex <= index <= endIndex
-
-      delete @state.content.tiles[index]
-      delete @linesPresentersByTileIndex[index]
-
-    for index in visibleTilesIndexes
+    visibleTiles = {}
+    for index in [startIndex...endIndex]
       presenter = @linesPresentersByTileIndex[index] ?= new LinesPresenter(@)
       presenter.startRow = Math.floor(index * linesPerTile)
       presenter.endRow = Math.ceil(Math.min(@model.getScreenLineCount(), (index + 1) * linesPerTile))
@@ -335,6 +328,19 @@ class TextEditorPresenter
       tile.lines = presenter.getState()
       tile.height = linesPerTile * @lineHeight
       tile.newlyCreated = isNewTile
+      tile.display = "block"
+
+      visibleTiles[index] = true
+
+    for index, tile of @state.content.tiles
+      continue if visibleTiles.hasOwnProperty(index)
+
+      if index is @scrollingTile
+        tile.display = "none"
+      else
+        delete @state.content.tiles[index]
+        delete @linesPresentersByTileIndex[index]
+
 
   updateCursorsState: ->
     @state.content.cursors = {}
diff --git a/src/tile-component.coffee b/src/tile-component.coffee
index 023f9a369..0f366dbdc 100644
--- a/src/tile-component.coffee
+++ b/src/tile-component.coffee
@@ -38,6 +38,10 @@ class TileComponent
       @oldState = {tiles: {}}
       @oldState.tiles[@id] = { lines: {}}
 
+    if @newState.tiles[@id].display isnt @oldState.tiles[@id]?.display
+      @domNode.style.display = @newState.tiles[@id].display
+      @oldState.tiles[@id]?.display = @newState.tiles[@id].display
+
     if @newState.tiles[@id].height isnt @oldState.tiles[@id]?.height
       @domNode.style.height = @newState.tiles[@id].height + 'px'
       @oldState.tiles[@id]?.height = @newState.tiles[@id].height