diff --git a/src/services/services.ts b/src/services/services.ts
index 2bbf286a1f2..7be3e2f9d04 100644
--- a/src/services/services.ts
+++ b/src/services/services.ts
@@ -3659,9 +3659,9 @@ namespace ts {
                         return containingNodeKind === SyntaxKind.Parameter;
 
                     case SyntaxKind.AsKeyword:
-                        containingNodeKind === SyntaxKind.ImportSpecifier ||
-                        containingNodeKind === SyntaxKind.ExportSpecifier ||
-                        containingNodeKind === SyntaxKind.NamespaceImport;
+                        return containingNodeKind === SyntaxKind.ImportSpecifier ||
+                            containingNodeKind === SyntaxKind.ExportSpecifier ||
+                            containingNodeKind === SyntaxKind.NamespaceImport;
 
                     case SyntaxKind.ClassKeyword:
                     case SyntaxKind.EnumKeyword:
@@ -7811,6 +7811,7 @@ namespace ts {
                 case SyntaxKind.GreaterThanEqualsToken:
                 case SyntaxKind.InstanceOfKeyword:
                 case SyntaxKind.InKeyword:
+                case SyntaxKind.AsKeyword:
                 case SyntaxKind.EqualsEqualsToken:
                 case SyntaxKind.ExclamationEqualsToken:
                 case SyntaxKind.EqualsEqualsEqualsToken:
diff --git a/tests/cases/fourslash/asOperatorCompletion.ts b/tests/cases/fourslash/asOperatorCompletion.ts
new file mode 100644
index 00000000000..2eaaae7e75d
--- /dev/null
+++ b/tests/cases/fourslash/asOperatorCompletion.ts
@@ -0,0 +1,8 @@
+/// <reference path="fourslash.ts" />
+
+//// type T = number;
+//// var x;
+//// var y = x as /**/
+
+goTo.marker();
+verify.completionListContains('T');