diff --git a/src/highlights-component.coffee b/src/highlights-component.coffee
index 292e94892..5af1840c3 100644
--- a/src/highlights-component.coffee
+++ b/src/highlights-component.coffee
@@ -8,7 +8,8 @@ HighlightsComponent = React.createClass
   displayName: 'HighlightsComponent'
 
   render: ->
-    div className: 'highlights', @renderHighlights()
+    div className: 'highlights',
+      @renderHighlights() if @isMounted()
 
   renderHighlights: ->
     {editor, highlightDecorations, lineHeightInPixels} = @props
diff --git a/src/lines-component.coffee b/src/lines-component.coffee
index afbeb1b57..65f8ff048 100644
--- a/src/lines-component.coffee
+++ b/src/lines-component.coffee
@@ -26,7 +26,7 @@ LinesComponent = React.createClass
     # The lines div must have the 'editor-colors' class so it has an opaque
     # background to avoid sub-pixel anti-aliasing problems on the GPU
     div {className: 'lines editor-colors', style},
-      HighlightsComponent({editor, highlightDecorations, lineHeightInPixels, defaultCharWidth, scopedCharacterWidthsChangeCount}) if @isMounted()
+      HighlightsComponent({editor, highlightDecorations, lineHeightInPixels, defaultCharWidth, scopedCharacterWidthsChangeCount})
 
   componentWillMount: ->
     @measuredLines = new WeakSet