diff --git a/Ghidra/Framework/Docking/src/main/java/docking/test/AbstractDockingTest.java b/Ghidra/Framework/Docking/src/main/java/docking/test/AbstractDockingTest.java
index 6219a23074..e0e722422d 100644
--- a/Ghidra/Framework/Docking/src/main/java/docking/test/AbstractDockingTest.java
+++ b/Ghidra/Framework/Docking/src/main/java/docking/test/AbstractDockingTest.java
@@ -384,6 +384,12 @@ public abstract class AbstractDockingTest extends AbstractGuiTest {
 			return;
 		}
 
+		if (w instanceof DockingDialog dialog) {
+			DialogComponentProvider component = dialog.getDialogComponent();
+			close(component);
+			return;
+		}
+
 		boolean wait = !isOnlyFrame(w);
 		runSwing(() -> w.setVisible(false), wait);
 	}