diff --git a/src/services/completions.ts b/src/services/completions.ts
index f3b26665c7c..8e7edc0b6e5 100644
--- a/src/services/completions.ts
+++ b/src/services/completions.ts
@@ -1239,6 +1239,9 @@ namespace ts.Completions {
                     case SyntaxKind.AsKeyword:
                         return parentKind === SyntaxKind.AsExpression;
 
+                    case SyntaxKind.LessThanToken:
+                        return parentKind === SyntaxKind.TypeReference;
+
                     case SyntaxKind.ExtendsKeyword:
                         return parentKind === SyntaxKind.TypeParameter;
                 }
diff --git a/tests/cases/fourslash/completionsAfterLessThanToken.ts b/tests/cases/fourslash/completionsAfterLessThanToken.ts
new file mode 100644
index 00000000000..c236f85e1fe
--- /dev/null
+++ b/tests/cases/fourslash/completionsAfterLessThanToken.ts
@@ -0,0 +1,12 @@
+/// <reference path="fourslash.ts" />
+
+//// function f() {
+//// 	const k: Record</**/
+//// }
+
+goTo.marker();
+verify.completions({
+    includes: [
+        { name: "string", sortText: completion.SortText.GlobalsOrKeywords }
+    ]
+});
diff --git a/tests/cases/fourslash/completionsIsPossiblyTypeArgumentPosition.ts b/tests/cases/fourslash/completionsIsPossiblyTypeArgumentPosition.ts
index 4161c31b795..1ea8416d70b 100644
--- a/tests/cases/fourslash/completionsIsPossiblyTypeArgumentPosition.ts
+++ b/tests/cases/fourslash/completionsIsPossiblyTypeArgumentPosition.ts
@@ -10,8 +10,8 @@
 ////x < {| "valueOnly": true |}
 ////f < {| "valueOnly": true |}
 ////g < {| "valueOnly": false |}
-////const something: C<{| "valueOnly": false |};
-////const something2: C<C<{| "valueOnly": false |};
+////const something: C<{| "typeOnly": true |};
+////const something2: C<C<{| "typeOnly": true |};
 ////new C<{| "valueOnly": false |};
 ////new C<C<{| "valueOnly": false |};
 ////
@@ -20,7 +20,10 @@
 ////new callAndConstruct<callAndConstruct</*callAndConstruct*/
 
 for (const marker of test.markers()) {
-    if (marker.data && marker.data.valueOnly) {
+    if (marker.data && marker.data.typeOnly) {
+        verify.completions({ marker, includes: "T", excludes: "x" });
+    }
+    else if (marker.data && marker.data.valueOnly) {
         verify.completions({ marker, includes: "x", excludes: "T" });
     }
     else {