diff --git a/Ghidra/Framework/Docking/src/main/java/docking/DockableComponent.java b/Ghidra/Framework/Docking/src/main/java/docking/DockableComponent.java
index 0784116849..826f4456d5 100644
--- a/Ghidra/Framework/Docking/src/main/java/docking/DockableComponent.java
+++ b/Ghidra/Framework/Docking/src/main/java/docking/DockableComponent.java
@@ -441,12 +441,15 @@ public class DockableComponent extends JPanel implements ContainerListener {
 	}
 
 	@Override
-	// we aren't focusable, so pass focus to a valid child component
 	public void requestFocus() {
 		if (lastFocusedComponent != null && lastFocusedComponent.isShowing()) {
 			lastFocusedComponent.requestFocus();
 			return;
 		}
+
+		if (placeholder == null) {
+			return;	// this implies we have been disposed
+		}
 		placeholder.getProvider().requestFocus();
 	}