diff --git a/src/harness/fourslash.ts b/src/harness/fourslash.ts
index 8104f113392..17f14e30737 100644
--- a/src/harness/fourslash.ts
+++ b/src/harness/fourslash.ts
@@ -717,6 +717,8 @@ namespace FourSlash {
         public verifyCompletionEntryDetails(entryName: string, expectedText: string, expectedDocumentation?: string, kind?: string) {
             const details = this.getCompletionEntryDetails(entryName);
 
+            assert(details, "no completion entry available");
+
             assert.equal(ts.displayPartsToString(details.displayParts), expectedText, this.assertionMessageAtLastKnownMarker("completion entry details text"));
 
             if (expectedDocumentation !== undefined) {
diff --git a/src/services/services.ts b/src/services/services.ts
index d051a4378e4..d5f63627471 100644
--- a/src/services/services.ts
+++ b/src/services/services.ts
@@ -3234,7 +3234,7 @@ namespace ts {
                 }
             }
 
-            return name;
+            return unescapeIdentifier(name);
         }
 
         function getCompletionData(fileName: string, position: number) {
diff --git a/tests/cases/fourslash/codeCompletionEscaping.ts b/tests/cases/fourslash/codeCompletionEscaping.ts
new file mode 100644
index 00000000000..b8182307b7b
--- /dev/null
+++ b/tests/cases/fourslash/codeCompletionEscaping.ts
@@ -0,0 +1,8 @@
+/// <reference path="fourslash.ts" />
+
+// @Filename: a.js
+// @allowJs: true
+////__foo;/**/
+
+goTo.marker();
+verify.completionListContains("__foo", undefined, undefined, "warning");