diff --git a/d2compiler/compile_test.go b/d2compiler/compile_test.go
index c7aad82fd..06d198501 100644
--- a/d2compiler/compile_test.go
+++ b/d2compiler/compile_test.go
@@ -2476,15 +2476,17 @@ d2/testdata/d2compiler/TestCompile/grid_gap_negative.d2:3:16: vertical-gap must
 			name: "grid_edge",
 			text: `hey: {
 	grid-rows: 1
-	a -> b
+	a -> b: ok
 }
 	c -> hey.b
 	hey.a -> c
+	hey -> hey.a
 
 	hey -> c: ok
 `,
 			expErr: `d2/testdata/d2compiler/TestCompile/grid_edge.d2:5:2: edges into grid diagrams are not supported yet
-d2/testdata/d2compiler/TestCompile/grid_edge.d2:6:2: edges into grid diagrams are not supported yet`,
+d2/testdata/d2compiler/TestCompile/grid_edge.d2:6:2: edges into grid diagrams are not supported yet
+d2/testdata/d2compiler/TestCompile/grid_edge.d2:7:2: edges into grid diagrams are not supported yet`,
 		},
 		{
 			name: "grid_nested",
diff --git a/d2layouts/d2grid/layout.go b/d2layouts/d2grid/layout.go
index 2d473e23d..a3fb3a963 100644
--- a/d2layouts/d2grid/layout.go
+++ b/d2layouts/d2grid/layout.go
@@ -209,7 +209,7 @@ func withoutGridDiagrams(ctx context.Context, g *d2graph.Graph, layout d2graph.L
 		// simple straight line edge routing between grid objects
 		for i, e := range g.Edges {
 			edgeOrder[e.AbsID()] = i
-			if e.Dst.ClosestGridDiagram() != obj {
+			if e.Dst.Parent.ClosestGridDiagram() != obj {
 				continue
 			}
 			e.Route = []*geo.Point{e.Src.Center(), e.Dst.Center()}
diff --git a/testdata/d2compiler/TestCompile/grid_edge.exp.json b/testdata/d2compiler/TestCompile/grid_edge.exp.json
index d501f033e..01dc6d78b 100644
--- a/testdata/d2compiler/TestCompile/grid_edge.exp.json
+++ b/testdata/d2compiler/TestCompile/grid_edge.exp.json
@@ -3,12 +3,16 @@
   "err": {
     "errs": [
       {
-        "range": "d2/testdata/d2compiler/TestCompile/grid_edge.d2,4:1:32-4:11:42",
+        "range": "d2/testdata/d2compiler/TestCompile/grid_edge.d2,4:1:36-4:11:46",
         "errmsg": "d2/testdata/d2compiler/TestCompile/grid_edge.d2:5:2: edges into grid diagrams are not supported yet"
       },
       {
-        "range": "d2/testdata/d2compiler/TestCompile/grid_edge.d2,5:1:44-5:11:54",
+        "range": "d2/testdata/d2compiler/TestCompile/grid_edge.d2,5:1:48-5:11:58",
         "errmsg": "d2/testdata/d2compiler/TestCompile/grid_edge.d2:6:2: edges into grid diagrams are not supported yet"
+      },
+      {
+        "range": "d2/testdata/d2compiler/TestCompile/grid_edge.d2,6:1:60-6:13:72",
+        "errmsg": "d2/testdata/d2compiler/TestCompile/grid_edge.d2:7:2: edges into grid diagrams are not supported yet"
       }
     ]
   }