diff --git a/internal/lsp/cmd/definition_test.go b/internal/lsp/cmd/definition_test.go
index f16948d9..d1388a96 100644
--- a/internal/lsp/cmd/definition_test.go
+++ b/internal/lsp/cmd/definition_test.go
@@ -24,7 +24,7 @@ import (
 )
 
 const (
-	expectedDefinitionsCount     = 26
+	expectedDefinitionsCount     = 28
 	expectedTypeDefinitionsCount = 2
 )
 
diff --git a/internal/lsp/lsp_test.go b/internal/lsp/lsp_test.go
index 55ed962d..44b39945 100644
--- a/internal/lsp/lsp_test.go
+++ b/internal/lsp/lsp_test.go
@@ -41,7 +41,7 @@ func testLSP(t *testing.T, exporter packagestest.Exporter) {
 	const expectedCompletionsCount = 65
 	const expectedDiagnosticsCount = 16
 	const expectedFormatCount = 4
-	const expectedDefinitionsCount = 17
+	const expectedDefinitionsCount = 19
 	const expectedTypeDefinitionsCount = 2
 	const expectedHighlightsCount = 2
 	const expectedSymbolsCount = 1
diff --git a/internal/lsp/source/identifier.go b/internal/lsp/source/identifier.go
index 5671f62f..da25c296 100644
--- a/internal/lsp/source/identifier.go
+++ b/internal/lsp/source/identifier.go
@@ -76,6 +76,7 @@ func identifier(ctx context.Context, v View, f File, pos token.Pos) (*Identifier
 	for _, n := range path[1:] {
 		if field, ok := n.(*ast.Field); ok {
 			result.wasEmbeddedField = len(field.Names) == 0
+			break
 		}
 	}
 	result.Name = result.ident.Name
@@ -88,8 +89,8 @@ func identifier(ctx context.Context, v View, f File, pos token.Pos) (*Identifier
 		// The original position was on the embedded field declaration, so we
 		// try to dig out the type and jump to that instead.
 		if v, ok := result.Declaration.Object.(*types.Var); ok {
-			if n, ok := v.Type().(*types.Named); ok {
-				result.Declaration.Object = n.Obj()
+			if typObj := typeToObject(v.Type()); typObj != nil {
+				result.Declaration.Object = typObj
 			}
 		}
 	}
diff --git a/internal/lsp/testdata/godef/b/b.go b/internal/lsp/testdata/godef/b/b.go
index ae608156..51d5aaf0 100644
--- a/internal/lsp/testdata/godef/b/b.go
+++ b/internal/lsp/testdata/godef/b/b.go
@@ -9,8 +9,15 @@ type S1 struct { //@S1
 }
 
 type S2 struct { //@S2
-	F1 string //@mark(S2F1, "F1")
-	F2 int    //@mark(S2F2, "F2")
+	F1   string //@mark(S2F1, "F1")
+	F2   int    //@mark(S2F2, "F2")
+	*a.A        //@godef("A", A)
+}
+
+type S3 struct {
+	F1 struct {
+		a.A //@godef("A", A)
+	}
 }
 
 func Bar() {