diff --git a/spec/app/tokenized-buffer-spec.coffee b/spec/app/tokenized-buffer-spec.coffee
index 91346de85..aaf08ed71 100644
--- a/spec/app/tokenized-buffer-spec.coffee
+++ b/spec/app/tokenized-buffer-spec.coffee
@@ -4,7 +4,7 @@ Buffer = require 'buffer'
 Range = require 'range'
 _ = require 'underscore'
 
-fdescribe "TokenizedBuffer", ->
+describe "TokenizedBuffer", ->
   [editSession, tokenizedBuffer, buffer, changeHandler] = []
 
   beforeEach ->
diff --git a/src/app/tokenized-buffer.coffee b/src/app/tokenized-buffer.coffee
index 510223eb0..20e213d5f 100644
--- a/src/app/tokenized-buffer.coffee
+++ b/src/app/tokenized-buffer.coffee
@@ -65,7 +65,7 @@ class TokenizedBuffer
   tokenizeNextChunk: ->
     rowsRemaining = @chunkSize
 
-    while @invalidRows.length and rowsRemaining > 0
+    while @firstInvalidRow()? and rowsRemaining > 0
       invalidRow = @invalidRows.shift()
       lastRow = @getLastRow()
       continue if invalidRow > lastRow
@@ -86,7 +86,7 @@ class TokenizedBuffer
       @invalidateRow(row + 1) unless filledRegion
       @trigger "change", { start: invalidRow, end: row, delta: 0 }
 
-    @tokenizeInBackground()
+    @tokenizeInBackground() if @firstInvalidRow()?
 
   firstInvalidRow: ->
     @invalidRows[0]