diff --git a/src/Lean/Server/InfoUtils.lean b/src/Lean/Server/InfoUtils.lean
index 1e3f97d0bf..986ae2ba39 100644
--- a/src/Lean/Server/InfoUtils.lean
+++ b/src/Lean/Server/InfoUtils.lean
@@ -164,7 +164,7 @@ structure GoalsAtResult where
   where to show intermediate/final states)
 -/
 partial def InfoTree.goalsAt? (t : InfoTree) (hoverPos : String.Pos) : List GoalsAtResult := do
-  t.deepestNodes fun
+  let rs := t.deepestNodes fun
     | ctx, i@(Info.ofTacticInfo ti), cs => OptionM.run do
       let (some pos, some tailPos) ← pure (i.pos?, i.tailPos?)
         | failure
@@ -175,6 +175,13 @@ partial def InfoTree.goalsAt? (t : InfoTree) (hoverPos : String.Pos) : List Goal
       return { ctxInfo := ctx, tacticInfo := ti, useAfter :=
         hoverPos > pos && !cs.any (hasNestedTactic pos tailPos) }
     | _, _, _ => none
+  if let r::_ := rs then
+    -- The above lenient heuristics return both goals when the cursor is placed adjacent
+    -- to two infos, such as in `skip;` (recall that `;` also has a tactic info).
+    -- Select goals with the minimum position only to resolve this.
+    -- NOTE: We can assume that the list is sorted by position
+    return rs.filter (·.tacticInfo.stx.getPos? == r.tacticInfo.stx.getPos?)
+  return rs
 where
   hasNestedTactic (pos tailPos) : InfoTree → Bool
     | InfoTree.node (Info.ofTacticInfo ti) cs => do
diff --git a/tests/lean/interactive/plainGoal.lean b/tests/lean/interactive/plainGoal.lean
index b006155a0f..352a8911d1 100644
--- a/tests/lean/interactive/plainGoal.lean
+++ b/tests/lean/interactive/plainGoal.lean
@@ -13,7 +13,11 @@ example : α → α := by
 
 example : 0 + n = n := by
   induction n with
-  | zero => rfl
+  | zero => simp; simp
        --^ $/lean/plainGoal
   | succ
    --^ $/lean/plainGoal
+
+example : α → α := by
+  intro a; apply a
+       --^ $/lean/plainGoal
diff --git a/tests/lean/interactive/plainGoal.lean.expected.out b/tests/lean/interactive/plainGoal.lean.expected.out
index 457df246e7..7c8f7eed91 100644
--- a/tests/lean/interactive/plainGoal.lean.expected.out
+++ b/tests/lean/interactive/plainGoal.lean.expected.out
@@ -32,3 +32,7 @@
  "```lean\ncase succ\nn✝ : Nat\nn_ih✝ : 0 + n✝ = n✝\n⊢ 0 + Nat.succ n✝ = Nat.succ n✝\n```",
  "goals":
  ["case succ\nn✝ : Nat\nn_ih✝ : 0 + n✝ = n✝\n⊢ 0 + Nat.succ n✝ = Nat.succ n✝"]}
+{"textDocument": {"uri": "file://plainGoal.lean"},
+ "position": {"line": 21, "character": 9}}
+{"rendered": "```lean\nα : Sort ?u\na : α\n⊢ α\n```",
+ "goals": ["α : Sort ?u\na : α\n⊢ α"]}