diff --git a/src/Lean/Server/Completion.lean b/src/Lean/Server/Completion.lean
index caf752543f..53612f7cb1 100644
--- a/src/Lean/Server/Completion.lean
+++ b/src/Lean/Server/Completion.lean
@@ -184,31 +184,46 @@ private def isDotCompletionMethod (info : ConstantInfo) : MetaM Bool :=
         return true
     return false
 
+/--
+  Given a type, try to extract relevant type names for dot notation field completion.
+  We extract the type name, parent struct names, and unfold the type.
+  The process mimics the dot notation elaboration procedure at `App.lean` -/
+private partial def getDotCompletionTypeNames (type : Expr) : MetaM NameSet :=
+  return (← visit type |>.run {}).2
+where
+  visit (type : Expr) : StateRefT NameSet MetaM Unit := do
+    match type.getAppFn with
+    | Expr.const typeName .. =>
+      modify fun s => s.insert typeName
+      if isStructureLike (← getEnv) typeName then
+        for parentName in getAllParentStructures (← getEnv) typeName do
+          modify fun s => s.insert parentName
+      let type? ← try unfoldDefinition? type catch _ => pure none
+      match type? with
+      | some type => visit type
+      | none => pure ()
+    | _ => pure ()
+
 private def dotCompletion (ctx : ContextInfo) (info : TermInfo) (expectedType? : Option Expr) : IO (Option CompletionList) :=
   runM ctx info.lctx do
-    let name? ←
+    let nameSet ←
       try
-        let type ← instantiateMVars (← inferType info.expr)
-        -- dbg_trace "dot >> {info.stx}, {info.expr} : {type}, {info.stx.isIdent}"
-        match type.getAppFn with
-        | Expr.const name .. => pure (some name)
-        | _ => pure none
+        getDotCompletionTypeNames (← instantiateMVars (← inferType info.expr))
       catch _ =>
-        pure none
-    match name? with
-    | some name =>
-      (← getEnv).constants.forM fun declName c => do
-        if  declName.getPrefix == name then
-          unless (← isBlackListed c.name) do
-            if (← isDotCompletionMethod c) then
-              addCompletionItem c.name.getString! c.type expectedType?
-    | _ =>
+        pure {}
+    if nameSet.isEmpty then
       if info.stx.isIdent then
         idCompletionCore ctx info.stx expectedType?
       else if info.stx.getKind == ``Lean.Parser.Term.completion then
         idCompletionCore ctx info.stx[0] expectedType?
       else
         failure
+    else
+      (← getEnv).constants.forM fun declName c => do
+        if nameSet.contains declName.getPrefix then
+          unless (← isBlackListed c.name) do
+            if (← isDotCompletionMethod c) then
+              addCompletionItem c.name.getString! c.type expectedType?
 
 private def optionCompletion (ctx : ContextInfo) : IO (Option CompletionList) := do
   ctx.runMetaM {} do
diff --git a/tests/lean/interactive/completion6.lean b/tests/lean/interactive/completion6.lean
new file mode 100644
index 0000000000..3bcf70d9af
--- /dev/null
+++ b/tests/lean/interactive/completion6.lean
@@ -0,0 +1,23 @@
+structure C where
+  f1 : Nat
+  f2 : Bool
+  b1 : String
+
+structure D extends C where
+  f3 : Bool
+
+def f (c : D) : IO Unit :=
+  visit c
+where
+  visit (c : D) : IO Unit :=
+    let x := c.
+             --^ textDocument/completion
+
+abbrev E := D
+
+def E.doubleF1 (e : E) :=
+  e.f1 + e.f1
+
+def g (e : E) :=
+  e.
+  --^ textDocument/completion
diff --git a/tests/lean/interactive/completion6.lean.expected.out b/tests/lean/interactive/completion6.lean.expected.out
new file mode 100644
index 0000000000..0c33cd3e49
--- /dev/null
+++ b/tests/lean/interactive/completion6.lean.expected.out
@@ -0,0 +1,19 @@
+{"textDocument": {"uri": "file://completion6.lean"},
+ "position": {"line": 12, "character": 15}}
+{"items":
+ [{"label": "b1", "detail": "C → String"},
+  {"label": "f1", "detail": "C → Nat"},
+  {"label": "f2", "detail": "C → Bool"},
+  {"label": "f3", "detail": "D → Bool"},
+  {"label": "toC", "detail": "D → C"}],
+ "isIncomplete": true}
+{"textDocument": {"uri": "file://completion6.lean"},
+ "position": {"line": 21, "character": 4}}
+{"items":
+ [{"label": "b1", "detail": "C → String"},
+  {"label": "doubleF1", "detail": "E → Nat"},
+  {"label": "f1", "detail": "C → Nat"},
+  {"label": "f2", "detail": "C → Bool"},
+  {"label": "f3", "detail": "D → Bool"},
+  {"label": "toC", "detail": "D → C"}],
+ "isIncomplete": true}