diff --git a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/service/control/DebuggerControlServicePlugin.java b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/service/control/DebuggerControlServicePlugin.java
index 0ed085db2b..c1f21cdc68 100644
--- a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/service/control/DebuggerControlServicePlugin.java
+++ b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/service/control/DebuggerControlServicePlugin.java
@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -207,15 +207,21 @@ public class DebuggerControlServicePlugin extends AbstractDebuggerPlugin
 	protected final ListenerForEditorInstallation listenerForEditorInstallation =
 		new ListenerForEditorInstallation();
 
-	public DebuggerControlServicePlugin(PluginTool tool) {
-		super(tool);
-	}
-
 	private final Map<Trace, ControlMode> currentModes = new HashMap<>();
 
 	private final ListenerSet<ControlModeChangeListener> listeners =
 		new ListenerSet<>(ControlModeChangeListener.class, true);
 
+	public DebuggerControlServicePlugin(PluginTool tool) {
+		super(tool);
+	}
+
+	@Override
+	protected void dispose() {
+		super.dispose();
+		uninstallAllMemoryEditors();
+	}
+
 	@Override
 	public ControlMode getCurrentMode(Trace trace) {
 		synchronized (currentModes) {