diff --git a/src/text-editor-component.coffee b/src/text-editor-component.coffee
index ca1017617..6780bd404 100644
--- a/src/text-editor-component.coffee
+++ b/src/text-editor-component.coffee
@@ -195,6 +195,9 @@ class TextEditorComponent
 
   becameVisible: ->
     @updatesPaused = true
+    if @invalidateMeasurementsWhenVisible
+      @invalidateMeasurements()
+      @invalidateMeasurementsWhenVisible = false
     @measureScrollbars() if @measureScrollbarsWhenShown
     @sampleFontStyling()
     @sampleBackgroundColors()
@@ -934,8 +937,11 @@ class TextEditorComponent
     @invalidateMeasurements()
 
   invalidateMeasurements: ->
-    @linesYardstick.invalidateCache()
-    @presenter.measurementsChanged()
+    if @isVisible()
+      @linesYardstick.invalidateCache()
+      @presenter.measurementsChanged()
+    else
+      @invalidateMeasurementsWhenVisible = true
 
   screenPositionForMouseEvent: (event, linesClientRect) ->
     pixelPosition = @pixelPositionForMouseEvent(event, linesClientRect)