diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/misc/MyProgramChangesDisplayPlugin.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/misc/MyProgramChangesDisplayPlugin.java
index fa44fde9b8..897fa89840 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/misc/MyProgramChangesDisplayPlugin.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/misc/MyProgramChangesDisplayPlugin.java
@@ -242,6 +242,10 @@ public class MyProgramChangesDisplayPlugin extends ProgramPlugin implements Doma
 	public void dispose() {
 
 		worker.dispose();
+		if (currentProgram != null) {
+			currentProgram.removeTransactionListener(transactionListener);
+			currentProgram.removeListener(this);
+		}
 
 		tool.getProject().getProjectData().removeDomainFolderChangeListener(folderListener);