diff --git a/Ghidra/Features/Base/src/test.slow/java/ghidra/program/model/data/DataTypeTest.java b/Ghidra/Features/Base/src/test.slow/java/ghidra/program/model/data/DataTypeTest.java
index 565b13b6e2..ec1c484a97 100644
--- a/Ghidra/Features/Base/src/test.slow/java/ghidra/program/model/data/DataTypeTest.java
+++ b/Ghidra/Features/Base/src/test.slow/java/ghidra/program/model/data/DataTypeTest.java
@@ -19,6 +19,7 @@ import static org.junit.Assert.*;
 
 import org.junit.*;
 
+import db.Transaction;
 import ghidra.program.database.ProgramBuilder;
 import ghidra.program.model.listing.Program;
 import ghidra.test.AbstractGhidraHeadedIntegrationTest;
@@ -147,6 +148,84 @@ public class DataTypeTest extends AbstractGhidraHeadedIntegrationTest {
 
 	}
 
+	@Test
+	public void testStructureReplace() {
+
+		try (Transaction tx = program.openTransaction("Test")) {
+
+			Structure struct1 = createStruct("abc", Undefined1DataType.dataType,
+				2 * dtm.getDataOrganization().getPointerSize());
+			struct1.setExplicitMinimumAlignment(
+				dtm.getDataOrganization().getDefaultPointerAlignment());
+
+			Structure resolvedStruct1 = (Structure) dtm.resolve(struct1, null);
+			assertEquals(0, resolvedStruct1.getParents().size());
+
+			Structure struct2 = createStruct("xyz", resolvedStruct1, 1);
+			struct2.setPackingEnabled(true);
+			Structure resolvedStruct2 = (Structure) dtm.resolve(struct2, null);
+
+			assertEquals(1, resolvedStruct1.getParents().size());
+
+			DataType dt =
+				new ArrayDataType(new PointerDataType(new IntegerDataType(dtm), dtm), 2, -1);
+
+			resolvedStruct2.replace(0, dt, -1);
+
+			assertEquals(0, resolvedStruct1.getParents().size());
+
+			//@formatter:off
+			assertEquals(
+				"/xyz\n" + 
+				"pack()\n" + 
+				"Structure xyz {\n" + 
+				"   0   int *[2]   8      \"\"\n" + 
+				"}\n" + 
+				"Size = 8   Actual Alignment = 4\n",
+				resolvedStruct2.toString());
+			//@formatter:on
+		}
+	}
+
+	@Test
+	public void testStructureReplace2() {
+
+		try (Transaction tx = program.openTransaction("Test")) {
+
+			Structure struct1 = new StructureDataType("abc", 0);
+			struct1.setPackingEnabled(true);
+			struct1.setExplicitMinimumAlignment(
+				dtm.getDataOrganization().getDefaultPointerAlignment());
+
+			Structure resolvedStruct1 = (Structure) dtm.resolve(struct1, null);
+			assertEquals(0, resolvedStruct1.getParents().size());
+
+			Structure struct2 = createStruct("xyz", resolvedStruct1, 1);
+			struct2.setPackingEnabled(true);
+			Structure resolvedStruct2 = (Structure) dtm.resolve(struct2, null);
+
+			assertEquals(1, resolvedStruct1.getParents().size());
+
+			DataType dt =
+				new ArrayDataType(new PointerDataType(new IntegerDataType(dtm), dtm), 0, -1);
+
+			resolvedStruct2.replace(0, dt, -1);
+
+			assertEquals(0, resolvedStruct1.getParents().size());
+
+			//@formatter:off
+			assertEquals(
+				"/xyz\n" + 
+				"pack()\n" + 
+				"Structure xyz {\n" + 
+				"   0   int *[0]   0      \"\"\n" + 
+				"}\n" + 
+				"Size = 1   Actual Alignment = 4\n",
+				resolvedStruct2.toString());
+			//@formatter:on
+		}
+	}
+
 	private StructureDataType createStruct(String name, DataType contentType, int count) {
 		StructureDataType struct = new StructureDataType(name, 0, dtm);
 		for (int i = 0; i < count; i++) {
diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/data/StructureDB.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/data/StructureDB.java
index 4f0076c439..dcbfb93053 100644
--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/data/StructureDB.java
+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/data/StructureDB.java
@@ -1317,6 +1317,8 @@ class StructureDB extends CompositeDB implements StructureInternal {
 			(!isPackingEnabled() || dataType.getAlignment() == oldDt.getAlignment())) {
 
 			oldComponent.update(componentName, dataType, comment);
+			oldDt.removeParent(this);
+			dataType.addParent(this);
 
 			setLastChangeTime(System.currentTimeMillis());
 			dataMgr.dataTypeChanged(this, false);