diff --git a/src/services/codefixes/importFixes.ts b/src/services/codefixes/importFixes.ts
index 3642e46612c..1f1b499d03b 100644
--- a/src/services/codefixes/importFixes.ts
+++ b/src/services/codefixes/importFixes.ts
@@ -115,6 +115,7 @@ namespace ts.codefix {
     registerCodeFix({
         errorCodes: [
             Diagnostics.Cannot_find_name_0.code,
+            Diagnostics.Cannot_find_namespace_0.code,
             Diagnostics._0_refers_to_a_UMD_global_but_the_current_file_is_a_module_Consider_adding_an_import_instead.code
         ],
         getCodeActions: (context: CodeFixContext) => {
diff --git a/tests/cases/fourslash/importNameCodeFixNewImportFile3.ts b/tests/cases/fourslash/importNameCodeFixNewImportFile3.ts
new file mode 100644
index 00000000000..af7901e03e6
--- /dev/null
+++ b/tests/cases/fourslash/importNameCodeFixNewImportFile3.ts
@@ -0,0 +1,15 @@
+/// <reference path="fourslash.ts" />
+
+//// [|let t: XXX/*0*/.I;|]
+
+// @Filename: ./module.ts
+//// export module XXX {
+////    export interface I {
+////    }
+//// }
+
+verify.importFixAtPosition([
+`import { XXX } from "./module";
+
+let t: XXX.I;`
+]);
\ No newline at end of file
diff --git a/tests/cases/fourslash/importNameCodeFixNewImportFile4.ts b/tests/cases/fourslash/importNameCodeFixNewImportFile4.ts
new file mode 100644
index 00000000000..62cf48c4977
--- /dev/null
+++ b/tests/cases/fourslash/importNameCodeFixNewImportFile4.ts
@@ -0,0 +1,16 @@
+/// <reference path="fourslash.ts" />
+
+//// [|let t: A/*0*/.B.I;|]
+
+// @Filename: ./module.ts
+//// export namespace A {
+////    export namespace B {
+////        export interface I { }
+////    }
+//// }
+
+verify.importFixAtPosition([
+`import { A } from "./module";
+
+let t: A.B.I;`
+]);
\ No newline at end of file