diff --git a/src/token-iterator.coffee b/src/token-iterator.coffee
index 1d940945d..c0aed798a 100644
--- a/src/token-iterator.coffee
+++ b/src/token-iterator.coffee
@@ -33,13 +33,10 @@ class TokenIterator
       if tag < 0
         if tag % 2 is 0
           scopeName = atom.grammars.scopeForId(tag + 1)
-          if @scopeStarts.length is 0
-            @scopeEnds.push(scopeName)
+          if @scopeStarts[@scopeStarts.length - 1] is scopeName
+            @scopeStarts.pop()
           else
-            startsTop = this.scopeStarts.pop()
-            if startsTop isnt scopeName
-              @scopeStarts.push(startsTop)
-              @scopeEnds.push(scopeName)
+            @scopeEnds.push()
           @scopes.pop()
         else
           scope = atom.grammars.scopeForId(tag)