diff --git a/src/services/completions.ts b/src/services/completions.ts
index 209d04f763e..8392a884cfb 100644
--- a/src/services/completions.ts
+++ b/src/services/completions.ts
@@ -925,7 +925,8 @@ namespace ts.Completions {
                                 isJsxInitializer = true;
                                 break;
                             case SyntaxKind.Identifier:
-                                if (previousToken !== (parent as JsxAttribute).name) {
+                                // For `<div x=[|f/**/|]`, `parent` will be `x` and `previousToken.parent` will be `f` (which is its own JsxAttribute)
+                                if (parent !== previousToken.parent && !(parent as JsxAttribute).initializer) {
                                     isJsxInitializer = previousToken as Identifier;
                                 }
                         }
diff --git a/tests/cases/fourslash/completionsJsxAttributeInitializer2.ts b/tests/cases/fourslash/completionsJsxAttributeInitializer2.ts
index c2954241755..da2496c9488 100644
--- a/tests/cases/fourslash/completionsJsxAttributeInitializer2.ts
+++ b/tests/cases/fourslash/completionsJsxAttributeInitializer2.ts
@@ -1,13 +1,24 @@
 /// <reference path="fourslash.ts" />
 
 // @Filename: /a.tsx
+////declare namespace JSX {
+////    interface IntrinsicElements {
+////        div: { a: string, b: string }
+////    }
+////}
 ////const foo = 0;
-////<div x=[|f/**/|] />;
+////<div x=[|f/*0*/|] />;
+////
+////<div a="1" b/*1*/ />
+////<div a /*2*/ />
 
 const [replacementSpan] = test.ranges();
-goTo.marker();
+goTo.marker("0");
 verify.completionListContains("foo", "const foo: 0", undefined, "const", undefined, undefined, {
     includeInsertTextCompletions: true,
     insertText: "{foo}",
     replacementSpan,
 });
+
+verify.completionsAt("1", ["b"]);
+verify.completionsAt("2", ["b"]);