diff --git a/src/harness/fourslash.ts b/src/harness/fourslash.ts
index b6a1cf72f3..f884711ae3 100644
--- a/src/harness/fourslash.ts
+++ b/src/harness/fourslash.ts
@@ -4894,12 +4894,14 @@ namespace FourSlashInterface {
             "declare",
             "keyof",
             "module",
+            "namespace",
             "never",
             "readonly",
             "number",
             "object",
             "string",
             "symbol",
+            "type",
             "unique",
             "unknown",
             "bigint",
@@ -5091,12 +5093,14 @@ namespace FourSlashInterface {
             "declare",
             "keyof",
             "module",
+            "namespace",
             "never",
             "readonly",
             "number",
             "object",
             "string",
             "symbol",
+            "type",
             "unique",
             "unknown",
             "bigint",
diff --git a/src/services/completions.ts b/src/services/completions.ts
index 1c3288a328..5aa003fd59 100644
--- a/src/services/completions.ts
+++ b/src/services/completions.ts
@@ -2406,6 +2406,8 @@ namespace ts.Completions {
                     return isFunctionLikeBodyKeyword(kind)
                         || kind === SyntaxKind.DeclareKeyword
                         || kind === SyntaxKind.ModuleKeyword
+                        || kind === SyntaxKind.TypeKeyword
+                        || kind === SyntaxKind.NamespaceKeyword
                         || isTypeKeyword(kind) && kind !== SyntaxKind.UndefinedKeyword;
                 case KeywordCompletionFilters.FunctionLikeBodyKeywords:
                     return isFunctionLikeBodyKeyword(kind);