diff --git a/d2oracle/edit.go b/d2oracle/edit.go
index bdc905adc..502640821 100644
--- a/d2oracle/edit.go
+++ b/d2oracle/edit.go
@@ -927,10 +927,11 @@ func deleteObject(g *d2graph.Graph, key *d2ast.KeyPath, obj *d2graph.Object) (*d
 				len(obj.Parent.References) > 1 {
 				// Redundant key.
 				deleteFromMap(ref.Scope, ref.MapKey)
-			} else if ref.MapKey.Value.Map != nil {
+			} else if ref.MapKey.Value.Map != nil && isSuffix {
 				for i := 0; i < len(ref.MapKey.Value.Map.Nodes); i++ {
 					n := ref.MapKey.Value.Map.Nodes[i]
 					if n.MapKey != nil && n.MapKey.Key != nil {
+						println("\033[1;31m--- DEBUG:", "=======================", "\033[m")
 						_, ok := d2graph.ReservedKeywords[n.MapKey.Key.Path[0].Unbox().ScalarString()]
 						if ok {
 							deleteFromMap(ref.MapKey.Value.Map, n.MapKey)
diff --git a/d2oracle/edit_test.go b/d2oracle/edit_test.go
index 91b25550c..ee07dc32b 100644
--- a/d2oracle/edit_test.go
+++ b/d2oracle/edit_test.go
@@ -4862,6 +4862,19 @@ Text 2
 			key: `a.b.c`,
 
 			exp: `a.b
+`,
+		},
+		{
+			name: "save_map",
+			text: `a.b: {
+  shape: circle
+}
+`,
+			key: `a`,
+
+			exp: `b: {
+  shape: circle
+}
 `,
 		},
 		{
diff --git a/testdata/d2oracle/TestDelete/save_map.exp.json b/testdata/d2oracle/TestDelete/save_map.exp.json
new file mode 100644
index 000000000..2cfe2696b
--- /dev/null
+++ b/testdata/d2oracle/TestDelete/save_map.exp.json
@@ -0,0 +1,149 @@
+{
+  "graph": {
+    "name": "",
+    "isFolderOnly": false,
+    "ast": {
+      "range": "d2/testdata/d2oracle/TestDelete/save_map.d2,0:0:0-3:0:23",
+      "nodes": [
+        {
+          "map_key": {
+            "range": "d2/testdata/d2oracle/TestDelete/save_map.d2,0:0:0-2:1:22",
+            "key": {
+              "range": "d2/testdata/d2oracle/TestDelete/save_map.d2,0:0:0-0:1:1",
+              "path": [
+                {
+                  "unquoted_string": {
+                    "range": "d2/testdata/d2oracle/TestDelete/save_map.d2,0:0:0-0:1:1",
+                    "value": [
+                      {
+                        "string": "b",
+                        "raw_string": "b"
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
+            "primary": {},
+            "value": {
+              "map": {
+                "range": "d2/testdata/d2oracle/TestDelete/save_map.d2,0:3:3-2:0:21",
+                "nodes": [
+                  {
+                    "map_key": {
+                      "range": "d2/testdata/d2oracle/TestDelete/save_map.d2,1:2:7-1:15:20",
+                      "key": {
+                        "range": "d2/testdata/d2oracle/TestDelete/save_map.d2,1:2:7-1:7:12",
+                        "path": [
+                          {
+                            "unquoted_string": {
+                              "range": "d2/testdata/d2oracle/TestDelete/save_map.d2,1:2:7-1:7:12",
+                              "value": [
+                                {
+                                  "string": "shape",
+                                  "raw_string": "shape"
+                                }
+                              ]
+                            }
+                          }
+                        ]
+                      },
+                      "primary": {},
+                      "value": {
+                        "unquoted_string": {
+                          "range": "d2/testdata/d2oracle/TestDelete/save_map.d2,1:9:14-1:15:20",
+                          "value": [
+                            {
+                              "string": "circle",
+                              "raw_string": "circle"
+                            }
+                          ]
+                        }
+                      }
+                    }
+                  }
+                ]
+              }
+            }
+          }
+        }
+      ]
+    },
+    "root": {
+      "id": "",
+      "id_val": "",
+      "label_dimensions": {
+        "width": 0,
+        "height": 0
+      },
+      "attributes": {
+        "label": {
+          "value": ""
+        },
+        "style": {},
+        "near_key": null,
+        "shape": {
+          "value": ""
+        },
+        "direction": {
+          "value": ""
+        },
+        "constraint": {
+          "value": ""
+        }
+      },
+      "zIndex": 0
+    },
+    "edges": null,
+    "objects": [
+      {
+        "id": "b",
+        "id_val": "b",
+        "label_dimensions": {
+          "width": 0,
+          "height": 0
+        },
+        "references": [
+          {
+            "key": {
+              "range": "d2/testdata/d2oracle/TestDelete/save_map.d2,0:0:0-0:1:1",
+              "path": [
+                {
+                  "unquoted_string": {
+                    "range": "d2/testdata/d2oracle/TestDelete/save_map.d2,0:0:0-0:1:1",
+                    "value": [
+                      {
+                        "string": "b",
+                        "raw_string": "b"
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
+            "key_path_index": 0,
+            "map_key_edge_index": -1
+          }
+        ],
+        "attributes": {
+          "label": {
+            "value": "b"
+          },
+          "style": {},
+          "near_key": null,
+          "shape": {
+            "value": "circle"
+          },
+          "direction": {
+            "value": ""
+          },
+          "constraint": {
+            "value": ""
+          }
+        },
+        "zIndex": 0
+      }
+    ]
+  },
+  "err": "<nil>"
+}