diff --git a/src/services/services.ts b/src/services/services.ts
index ede6fb8ca7b..bec00b9a66a 100644
--- a/src/services/services.ts
+++ b/src/services/services.ts
@@ -6039,11 +6039,13 @@ module ts {
                     let end = triviaScanner.getTextPos();
                     let width = end - start;
 
-                    if (textSpanIntersectsWith(span, start, width)) {
-                        if (!isTrivia(kind)) {
-                            return;
-                        }
+                    // The moment we get something that isn't trivia, then stop processing.
+                    if (!isTrivia(kind)) {
+                        return;
+                    }
 
+                    // Only bother with the trivia if it at least intersects the span of interest.
+                    if (textSpanIntersectsWith(span, start, width)) {
                         if (isComment(kind)) {
                             // Simple comment.  Just add as is.
                             pushClassification(start, width, ClassificationType.comment);