diff --git a/src/services/completions.ts b/src/services/completions.ts
index 3e02ba7c20237..c5680ba9c4686 100644
--- a/src/services/completions.ts
+++ b/src/services/completions.ts
@@ -1504,6 +1504,8 @@ namespace ts.Completions {
                     : KeywordCompletionFilters.TypeKeywords;
             }
 
+            const objectLiteralVariableDeclaration = getVariableDeclarationOfObjectLiteral(location);
+
             filterMutate(symbols, symbol => {
                 if (!isSourceFile(location)) {
                     // export = /**/ here we want to get all meanings, so any symbol is ok
@@ -1511,6 +1513,11 @@ namespace ts.Completions {
                         return true;
                     }
 
+                    // Filter out variables from their own initializers, e.g. `const o = { prop: /* no 'o' here */ }`
+                    if (objectLiteralVariableDeclaration && symbol.valueDeclaration === objectLiteralVariableDeclaration) {
+                        return false;
+                    }
+
                     symbol = skipAlias(symbol, typeChecker);
 
                     // import m = /**/ <-- It can only access namespace (if typing import = x. this would get member symbols and not namespace)
@@ -1529,6 +1536,29 @@ namespace ts.Completions {
             });
         }
 
+        function getVariableDeclarationOfObjectLiteral(property: Node): VariableDeclaration | undefined {
+            if (!isIdentifier(property)) {
+                return undefined;
+            }
+
+            let curNode: Node = property.parent;
+            while (curNode && curNode.parent) {
+                if ((isPropertyAssignment(curNode) || isShorthandPropertyAssignment(curNode)) && isObjectLiteralExpression(curNode.parent)) {
+                    curNode = curNode.parent.parent;
+
+                    if (isVariableDeclaration(curNode)) {
+                        return curNode;
+                    }
+                }
+                else {
+                    return undefined;
+                }
+            }
+
+            return undefined;
+        }
+
+
         function isTypeOnlyCompletion(): boolean {
             return insideJsDocTagTypeExpression
                 || !isContextTokenValueLocation(contextToken) &&
diff --git a/tests/cases/fourslash/completionListInObjectLiteral5.ts b/tests/cases/fourslash/completionListInObjectLiteral5.ts
new file mode 100644
index 0000000000000..eb245d748bf41
--- /dev/null
+++ b/tests/cases/fourslash/completionListInObjectLiteral5.ts
@@ -0,0 +1,26 @@
+/// <reference path="fourslash.ts" />
+
+////const o = 'something' 
+////const obj = {
+////    prop: o/*1*/,
+////    pro() {
+////        const obj1 = {
+////            p:{
+////                s: {
+////                    h: {
+////                       hh: o/*2*/
+////                    },
+////                    someFun() {
+////                        o/*3*/
+////                    }
+////                }
+////            }
+////        }
+////    },
+////    o/*4*/
+////}
+
+verify.completions({ marker: ["1"], excludes: ['obj'], includes: ['o'] });
+verify.completions({ marker: ["2"], excludes: ['obj1'], includes: ['o', 'obj'] });
+verify.completions({ marker: ["3"], includes: ['o', 'obj', 'obj1'] });
+verify.completions({ marker: ["4"], includes: ['o'], excludes: ['obj'] });
\ No newline at end of file
diff --git a/tests/cases/fourslash/completionPropertyShorthandForObjectLiteral2.ts b/tests/cases/fourslash/completionPropertyShorthandForObjectLiteral2.ts
index ec54418c77935..40aa223b7eced 100644
--- a/tests/cases/fourslash/completionPropertyShorthandForObjectLiteral2.ts
+++ b/tests/cases/fourslash/completionPropertyShorthandForObjectLiteral2.ts
@@ -12,6 +12,11 @@
 //// };
 
 verify.completions({
-    marker: test.markers(),
-    exact: completion.globalsPlus(["foo", "bar", "obj1", "obj2"]),
+    marker: ["1"],
+    exact: completion.globalsPlus(["foo", "bar", "obj2"]),
+});
+
+verify.completions({
+    marker: ["2"],
+    exact: completion.globalsPlus(["foo", "bar", "obj1"]),
 });
diff --git a/tests/cases/fourslash/completionPropertyShorthandForObjectLiteral3.ts b/tests/cases/fourslash/completionPropertyShorthandForObjectLiteral3.ts
index 0a6fad60b293e..70c1f60055425 100644
--- a/tests/cases/fourslash/completionPropertyShorthandForObjectLiteral3.ts
+++ b/tests/cases/fourslash/completionPropertyShorthandForObjectLiteral3.ts
@@ -7,5 +7,5 @@
 
 verify.completions({
     marker: ["1"],
-    exact: completion.globalsPlus(["foo", "bar", "obj"])
+    exact: completion.globalsPlus(["foo", "bar"]),
 });
diff --git a/tests/cases/fourslash/completionPropertyShorthandForObjectLiteral4.ts b/tests/cases/fourslash/completionPropertyShorthandForObjectLiteral4.ts
index 35daa6185a3f1..a720bcc1dc6b2 100644
--- a/tests/cases/fourslash/completionPropertyShorthandForObjectLiteral4.ts
+++ b/tests/cases/fourslash/completionPropertyShorthandForObjectLiteral4.ts
@@ -7,5 +7,5 @@
 
 verify.completions({
     marker: ["1"],
-    exact: completion.globalsPlus(["foo", "bar", "obj"])
+    exact: completion.globalsPlus(["foo", "bar"]),
 });
diff --git a/tests/cases/fourslash/completionPropertyShorthandForObjectLiteral5.ts b/tests/cases/fourslash/completionPropertyShorthandForObjectLiteral5.ts
index 74ded23477463..47aeeb83677a7 100644
--- a/tests/cases/fourslash/completionPropertyShorthandForObjectLiteral5.ts
+++ b/tests/cases/fourslash/completionPropertyShorthandForObjectLiteral5.ts
@@ -7,7 +7,6 @@
 //// const obj = { exp/**/
 
 verify.completions({
-  marker: "",
-  exact: completion.globalsPlus(["obj"]),
-  preferences: { includeCompletionsForModuleExports: true }
-});
\ No newline at end of file
+    marker: "",
+    preferences: { includeCompletionsForModuleExports: true },
+});