diff --git a/Ghidra/Framework/Docking/src/main/java/docking/ComponentProvider.java b/Ghidra/Framework/Docking/src/main/java/docking/ComponentProvider.java
index 5609532fa5..2a35e40dcb 100644
--- a/Ghidra/Framework/Docking/src/main/java/docking/ComponentProvider.java
+++ b/Ghidra/Framework/Docking/src/main/java/docking/ComponentProvider.java
@@ -1100,6 +1100,11 @@ public abstract class ComponentProvider implements HelpDescriptor, ActionContext
 		@Override
 		public void actionPerformed(ActionContext context) {
 
+			if (isShowing()) {
+				setVisible(false);
+				return;
+			}
+
 			DockingWindowManager myDwm = DockingWindowManager.getInstance(getComponent());
 			if (myDwm == null) {
 				// this can happen when the tool loses focus