diff --git a/src/services/completions.ts b/src/services/completions.ts
index df78ab931d1..d5fe54df719 100644
--- a/src/services/completions.ts
+++ b/src/services/completions.ts
@@ -915,13 +915,29 @@ namespace ts.Completions {
                 }
             }
             else if (sourceFile.languageVariant === LanguageVariant.JSX) {
-                if (kind === SyntaxKind.LessThanToken) {
-                    isRightOfOpenTag = true;
-                    location = contextToken;
-                }
-                else if (kind === SyntaxKind.SlashToken && contextToken.parent.kind === SyntaxKind.JsxClosingElement) {
-                    isStartingCloseTag = true;
-                    location = contextToken;
+                switch (contextToken.parent.kind) {
+                    case SyntaxKind.JsxClosingElement:
+                        if (kind === SyntaxKind.SlashToken) {
+                            isStartingCloseTag = true;
+                            location = contextToken;
+                        }
+                        break;
+
+                    case SyntaxKind.BinaryExpression:
+                        if (!((contextToken.parent as BinaryExpression).left.flags & NodeFlags.ThisNodeHasError)) {
+                            // It has a left-hand side, so we're not in an opening JSX tag.
+                            break;
+                        }
+                        // fall through
+
+                    case SyntaxKind.JsxSelfClosingElement:
+                    case SyntaxKind.JsxElement:
+                    case SyntaxKind.JsxOpeningElement:
+                        if (kind === SyntaxKind.LessThanToken) {
+                            isRightOfOpenTag = true;
+                            location = contextToken;
+                        }
+                        break;
                 }
             }
         }
diff --git a/tests/cases/fourslash/tsxCompletionNonTagLessThan.ts b/tests/cases/fourslash/tsxCompletionNonTagLessThan.ts
new file mode 100644
index 00000000000..d40201146a3
--- /dev/null
+++ b/tests/cases/fourslash/tsxCompletionNonTagLessThan.ts
@@ -0,0 +1,14 @@
+/// <reference path='fourslash.ts'/>
+
+////var x: Array<numb/*a*/;
+////[].map<numb/*b*/;
+////1 < Infini/*c*/;
+
+for (const marker of ["a", "b"]) {
+    goTo.marker(marker);
+    verify.completionListContains("number");
+    verify.not.completionListContains("SVGNumber");
+};
+
+goTo.marker("c");
+verify.completionListContains("Infinity");