diff --git a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/memview/DebuggerMemviewTraceListener.java b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/memview/DebuggerMemviewTraceListener.java
index f65321e1a8..1128e46566 100644
--- a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/memview/DebuggerMemviewTraceListener.java
+++ b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/memview/DebuggerMemviewTraceListener.java
@@ -211,6 +211,9 @@ public class DebuggerMemviewTraceListener extends TraceDomainObjectListener {
 				}
 			});
 		}
+		else {
+			provider.reset();
+		}
 	}
 
 	public void traceClosed(Trace trace) {
diff --git a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/memview/MemviewProvider.java b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/memview/MemviewProvider.java
index bbe36ede56..2451c79387 100644
--- a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/memview/MemviewProvider.java
+++ b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/memview/MemviewProvider.java
@@ -152,6 +152,10 @@ public class MemviewProvider extends ComponentProviderAdapter {
 
 	private void performApplyFilterToPanel(ActionContext ctx) {
 		applyFilter = !isApplyFilter();
+		applyFilter();
+	}
+
+	public void applyFilter() {
 		if (applyFilter) {
 			memviewTable.applyFilter();
 		}
@@ -265,7 +269,8 @@ public class MemviewProvider extends ComponentProviderAdapter {
 	public void setBoxes(List<MemoryBox> blist) {
 		Swing.runIfSwingOrRunLater(() -> {
 			memviewTable.setBoxes(blist);
-			memviewPanel.setBoxes(blist);
+			memviewTable.applyFilter();
+			//memviewPanel.setBoxes(memviewTable.getBoxes());
 		});
 	}
 
@@ -285,7 +290,8 @@ public class MemviewProvider extends ComponentProviderAdapter {
 	public void addBoxes(List<MemoryBox> blist) {
 		Swing.runIfSwingOrRunLater(() -> {
 			memviewTable.addBoxes(blist);
-			memviewPanel.addBoxes(blist);
+			memviewTable.applyFilter();
+			//memviewPanel.addBoxes(memviewTable.getBoxes());
 		});
 	}