diff --git a/src/services/services.ts b/src/services/services.ts
index 24e85a2a019..c623fe15b02 100644
--- a/src/services/services.ts
+++ b/src/services/services.ts
@@ -113,7 +113,7 @@ namespace ts {
                 }
                 pos = textPos;
                 if (token === SyntaxKind.EndOfFileToken) {
-                    return pos;
+                    break;
                 }
             }
             return pos;
diff --git a/src/services/utilities.ts b/src/services/utilities.ts
index c5b2a2b4f90..5336d47c1f3 100644
--- a/src/services/utilities.ts
+++ b/src/services/utilities.ts
@@ -753,7 +753,7 @@ namespace ts {
                     const start = child.getStart(sourceFile, includeJsDoc);
                     const lookInPreviousChild =
                         (start >= position) || // cursor in the leading trivia
-                        nodeHasTokens(child) ||
+                        !nodeHasTokens(child) ||
                         (child.kind === SyntaxKind.JsxText && start === child.end); // whitespace only JsxText
 
                     if (lookInPreviousChild) {