diff --git a/Ghidra/Framework/Docking/src/main/java/docking/ComponentProvider.java b/Ghidra/Framework/Docking/src/main/java/docking/ComponentProvider.java
index 6ac7c08922..5d0a75d994 100644
--- a/Ghidra/Framework/Docking/src/main/java/docking/ComponentProvider.java
+++ b/Ghidra/Framework/Docking/src/main/java/docking/ComponentProvider.java
@@ -146,7 +146,7 @@ public abstract class ComponentProvider implements HelpDescriptor, ActionContext
 	 *        {@link #getContextType()}
 	 */
 	public ComponentProvider(Tool tool, String name, String owner, Class<?> contextType) {
-		this.dockingTool = tool;
+		this.dockingTool = Objects.requireNonNull(tool);
 		this.name = name;
 		this.owner = owner;
 		this.title = name;
diff --git a/Ghidra/Framework/Docking/src/main/java/docking/DockingWindowManager.java b/Ghidra/Framework/Docking/src/main/java/docking/DockingWindowManager.java
index 3924cdcc6d..1a3535ab74 100644
--- a/Ghidra/Framework/Docking/src/main/java/docking/DockingWindowManager.java
+++ b/Ghidra/Framework/Docking/src/main/java/docking/DockingWindowManager.java
@@ -503,7 +503,7 @@ public class DockingWindowManager implements PropertyChangeListener, Placeholder
 	}
 
 	/**
-	 * Returns true if the specified provider's component is visible
+	 * Returns true if the specified provider's component is or soon will be visible.
 	 *
 	 * @param provider component provider
 	 * @return true if the specified provider's component is visible
@@ -511,7 +511,7 @@ public class DockingWindowManager implements PropertyChangeListener, Placeholder
 	public boolean isVisible(ComponentProvider provider) {
 		ComponentPlaceholder placeholder = getActivePlaceholder(provider);
 		if (placeholder != null) {
-			return placeholder.isShowing();
+			return placeholder.isActive();
 		}
 		return false;
 	}
diff --git a/Ghidra/Framework/Docking/src/main/java/docking/PlaceholderManager.java b/Ghidra/Framework/Docking/src/main/java/docking/PlaceholderManager.java
index 4cc23520df..db8be2e2fc 100644
--- a/Ghidra/Framework/Docking/src/main/java/docking/PlaceholderManager.java
+++ b/Ghidra/Framework/Docking/src/main/java/docking/PlaceholderManager.java
@@ -64,7 +64,7 @@ class PlaceholderManager {
 		}
 
 		if (defaultPlaceholder.isActive() != restoredPlaceholder.isActive()) {
-			if (restoredPlaceholder.isShowing()) {
+			if (restoredPlaceholder.isActive()) {
 				provider.componentShown();
 			}
 			else {