diff --git a/Ghidra/Features/Base/src/main/java/ghidra/features/base/memsearch/gui/MemorySearchProvider.java b/Ghidra/Features/Base/src/main/java/ghidra/features/base/memsearch/gui/MemorySearchProvider.java
index fb2e9d8894..f6031ae460 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/features/base/memsearch/gui/MemorySearchProvider.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/features/base/memsearch/gui/MemorySearchProvider.java
@@ -550,13 +550,19 @@ public class MemorySearchProvider extends ComponentProviderAdapter
 	}
 
 	private void dispose() {
-		glassPaneMessage.hide();
-		glassPaneMessage = null;
+		if (glassPaneMessage != null) {
+			glassPaneMessage.hide();
+			glassPaneMessage = null;
+		}
+
 		matchHighlighter.dispose();
+
 		USED_IDS.remove(id);
+
 		if (navigatable != null) {
 			navigatable.removeNavigatableListener(this);
 		}
+
 		resultsPanel.dispose();
 		tool.removeContextListener(this);
 		program.removeCloseListener(this);