diff --git a/src/services/completions.ts b/src/services/completions.ts
index 92884a0ad1cca..95f6b828684cf 100644
--- a/src/services/completions.ts
+++ b/src/services/completions.ts
@@ -336,6 +336,7 @@ import {
     rangeContainsPosition,
     rangeContainsPositionExclusive,
     rangeIsOnSingleLine,
+    scanner,
     ScriptElementKind,
     ScriptElementKindModifier,
     ScriptTarget,
@@ -1842,9 +1843,16 @@ function createCompletionEntry(
     if (parentNamedImportOrExport) {
         const languageVersion = getEmitScriptTarget(host.getCompilationSettings());
         if (!isIdentifierText(name, languageVersion)) {
-            insertText = JSON.stringify(name);
+            insertText = quotePropertyName(sourceFile, preferences, name);
+
             if (parentNamedImportOrExport.kind === SyntaxKind.NamedImports) {
-                insertText += " as " + generateIdentifierForArbitraryString(name, languageVersion);
+                // check if it is import { ^here as name } from '...'
+                // we have to access the scanner here to check if it is { ^here as name } or { ^here, as, name }.
+                scanner.setText(sourceFile.text);
+                scanner.resetTokenState(position);
+                if (!(scanner.scan() === SyntaxKind.AsKeyword && scanner.scan() === SyntaxKind.Identifier)) {
+                    insertText += " as " + generateIdentifierForArbitraryString(name, languageVersion);
+                }
             }
         }
         else if (parentNamedImportOrExport.kind === SyntaxKind.NamedImports) {
@@ -4835,7 +4843,10 @@ function getCompletionData(
                 return !isFromObjectTypeDeclaration(contextToken);
 
             case SyntaxKind.Identifier: {
-                if (containingNodeKind === SyntaxKind.ImportSpecifier &&
+                if ((
+                    containingNodeKind === SyntaxKind.ImportSpecifier ||
+                    containingNodeKind === SyntaxKind.ExportSpecifier
+                ) &&
                     contextToken === (parent as ImportSpecifier).name &&
                     (contextToken as Identifier).text === "type"
                 ) {
diff --git a/tests/cases/fourslash/completionsImportOrExportSpecifier.ts b/tests/cases/fourslash/completionsImportOrExportSpecifier.ts
index 533c6f315d031..90548400ef928 100644
--- a/tests/cases/fourslash/completionsImportOrExportSpecifier.ts
+++ b/tests/cases/fourslash/completionsImportOrExportSpecifier.ts
@@ -4,9 +4,11 @@
 //// export let foo = 1;
 //// let someValue = 2;
 //// let someType = 3;
+//// type someType2 = 4;
 //// export {
 ////   someValue as "__some value",
 ////   someType as "__some type",
+////   type someType2 as "__some type2",
 //// };
 
 // @Filename: values.ts
@@ -14,6 +16,8 @@
 //// import { /*valueImport1*/ as valueImport1 } from "./exports";
 //// import { foo as /*valueImport2*/ } from "./exports";
 //// import { foo, /*valueImport3*/ as valueImport3 } from "./exports";
+//// import * as _a from "./exports";
+//// _a./*namespaceImport1*/;
 ////
 //// export { /*valueExport0*/ } from "./exports";
 //// export { /*valueExport1*/ as valueExport1 } from "./exports";
@@ -25,6 +29,7 @@
 //// import { type /*typeImport1*/ as typeImport1 } from "./exports";
 //// import { type foo as /*typeImport2*/ } from "./exports";
 //// import { type foo, type /*typeImport3*/ as typeImport3 } from "./exports";
+//// import * as _a from "./exports";
 ////
 //// export { type /*typeExport0*/ } from "./exports";
 //// export { type /*typeExport1*/ as typeExport1 } from "./exports";
@@ -32,27 +37,34 @@
 //// export { type foo, type /*typeExport3*/ } from "./exports";
 
 const __some_type = { name: "__some type", insertText: '"__some type"' }
+const __some_type2 = { name: "__some type2", insertText: '"__some type2"' }
 const __some_value = { name: "__some value", insertText: '"__some value"' }
 const __some_type_as = { name: "__some type", insertText: '"__some type" as __some_type' }
+const __some_type_squared = { name: "__some type", insertText: '["__some type"]' }
+const __some_type2_as = { name: "__some type2", insertText: '"__some type2" as __some_type2' }
+const __some_type2_squared = { name: "__some type2", insertText: '["__some type2"]' }
 const __some_value_as = { name: "__some value", insertText: '"__some value" as __some_value' }
+const __some_value_squared = { name: "__some value", insertText: '["__some value"]' }
 const typeKeyword = { name: "type", sortText: completion.SortText.GlobalsOrKeywords }
 
-verify.completions({ marker: "valueImport0", exact: [__some_type_as, __some_value_as, "foo", typeKeyword] });
-verify.completions({ marker: "valueImport1", exact: [__some_type_as, __some_value_as, "foo", typeKeyword] });
+verify.completions({ marker: "valueImport0", exact: [__some_type_as, __some_type2_as, __some_value_as, "foo", typeKeyword] });
+verify.completions({ marker: "valueImport1", exact: [__some_type, __some_type2, __some_value, "foo", typeKeyword] });
 verify.completions({ marker: "valueImport2", exact: [] });
-verify.completions({ marker: "valueImport3", exact: [__some_type_as, __some_value_as, typeKeyword] });
+verify.completions({ marker: "valueImport3", exact: [__some_type, __some_type2, __some_value, typeKeyword] });
+// see https://github.com/microsoft/TypeScript/issues/58815
+verify.completions({ marker: 'namespaceImport1', exact: [/* __some_type_squared, __some_value_squared, */ 'foo'] })
 
-verify.completions({ marker: "valueExport0", exact: [__some_type, __some_value, "foo", typeKeyword] });
-verify.completions({ marker: "valueExport1", exact: [__some_type, __some_value, "foo", typeKeyword] });
+verify.completions({ marker: "valueExport0", exact: [__some_type, __some_type2, __some_value, "foo", typeKeyword] });
+verify.completions({ marker: "valueExport1", exact: [__some_type, __some_type2, __some_value, "foo", typeKeyword] });
 verify.completions({ marker: "valueExport2", exact: [] });
-verify.completions({ marker: "valueExport3", exact: [__some_type, __some_value, typeKeyword] });
+verify.completions({ marker: "valueExport3", exact: [__some_type, __some_type2, __some_value, typeKeyword] });
 
-verify.completions({ marker: "typeImport0", exact: [__some_type_as, __some_value_as, "foo"] });
-verify.completions({ marker: "typeImport1", exact: [__some_type_as, __some_value_as, "foo"] });
+verify.completions({ marker: "typeImport0", exact: [__some_type_as, __some_type2_as, __some_value_as, "foo"] });
+verify.completions({ marker: "typeImport1", exact: [__some_type, __some_type2, __some_value, "foo"] });
 verify.completions({ marker: "typeImport2", exact: [] });
-verify.completions({ marker: "typeImport3", exact: [__some_type_as, __some_value_as] });
+verify.completions({ marker: "typeImport3", exact: [__some_type, __some_type2, __some_value] });
 
-verify.completions({ marker: "typeExport0", exact: [] });
-verify.completions({ marker: "typeExport1", exact: [__some_type, __some_value, "foo"] });
+verify.completions({ marker: "typeExport0", exact: [__some_type, __some_type2, __some_value, "foo"] });
+verify.completions({ marker: "typeExport1", exact: [__some_type, __some_type2, __some_value, "foo"] });
 verify.completions({ marker: "typeExport2", exact: [] });
-verify.completions({ marker: "typeExport3", exact: [] });
+verify.completions({ marker: "typeExport3", exact: [__some_type, __some_type2, __some_value] });