diff --git a/src/services/services.ts b/src/services/services.ts
index 878d81fe195..9c00b92a063 100644
--- a/src/services/services.ts
+++ b/src/services/services.ts
@@ -3460,9 +3460,11 @@ namespace ts {
                             containingNodeKind === SyntaxKind.EnumDeclaration ||                        // enum a { foo, |
                             isFunction(containingNodeKind) ||
                             containingNodeKind === SyntaxKind.ClassDeclaration ||                       // class A<T, |
+                            containingNodeKind === SyntaxKind.ClassExpression ||                        // var C = class D<T, |
                             containingNodeKind === SyntaxKind.FunctionDeclaration ||                    // function A<T, |
                             containingNodeKind === SyntaxKind.InterfaceDeclaration ||                   // interface A<T, |
-                            containingNodeKind === SyntaxKind.ArrayBindingPattern;                      // var [x, y|
+                            containingNodeKind === SyntaxKind.ArrayBindingPattern ||                    // var [x, y|
+                            containingNodeKind === SyntaxKind.TypeAliasDeclaration;                     // type Map, K, |
                                                                                                           
                     case SyntaxKind.DotToken:
                         return containingNodeKind === SyntaxKind.ArrayBindingPattern;                   // var [.|
@@ -3490,9 +3492,10 @@ namespace ts {
 
                     case SyntaxKind.LessThanToken:
                         return containingNodeKind === SyntaxKind.ClassDeclaration ||                    // class A< |
+                            containingNodeKind === SyntaxKind.ClassExpression ||                        // var C = class D< |
                             containingNodeKind === SyntaxKind.FunctionDeclaration ||                    // function A< |
                             containingNodeKind === SyntaxKind.InterfaceDeclaration ||                   // interface A< |
-                            containingNodeKind === SyntaxKind.TypeAliasDeclaration ||
+                            containingNodeKind === SyntaxKind.TypeAliasDeclaration ||                   // type List< |
                             isFunction(containingNodeKind);
 
                     case SyntaxKind.StaticKeyword:
diff --git a/tests/cases/fourslash/completionListInTypeParameterOfClassExpression1.ts b/tests/cases/fourslash/completionListInTypeParameterOfClassExpression1.ts
new file mode 100644
index 00000000000..1398b05e701
--- /dev/null
+++ b/tests/cases/fourslash/completionListInTypeParameterOfClassExpression1.ts
@@ -0,0 +1,15 @@
+/// <reference path='fourslash.ts'/>
+
+////var C0 = class D</*0*/
+////var C1 = class D</*1*/T> {}
+////var C3 = class D<T, /*2*/
+////var C4 = class D<T, /*3*/U>{}
+
+goTo.marker("0");
+verify.completionListIsEmpty();
+goTo.marker("1");
+verify.completionListIsEmpty();
+goTo.marker("2");
+verify.completionListIsEmpty();
+goTo.marker("3");
+verify.completionListIsEmpty();
\ No newline at end of file