diff --git a/Ghidra/Features/ProgramDiff/src/test.slow/java/ghidra/app/plugin/core/diff/DiffTestAdapter.java b/Ghidra/Features/ProgramDiff/src/test.slow/java/ghidra/app/plugin/core/diff/DiffTestAdapter.java
index 2caf34bd2a..5beaf398c9 100644
--- a/Ghidra/Features/ProgramDiff/src/test.slow/java/ghidra/app/plugin/core/diff/DiffTestAdapter.java
+++ b/Ghidra/Features/ProgramDiff/src/test.slow/java/ghidra/app/plugin/core/diff/DiffTestAdapter.java
@@ -730,14 +730,14 @@ public class DiffTestAdapter extends AbstractGhidraHeadedIntegrationTest {
 		performAction(action);
 	}
 
-	Component getComponentOfType(Container container, Class<?> componentClass) {
+	<T extends Component> T getComponentOfType(Container container, Class<T> componentClass) {
 		Component[] comps = container.getComponents();
 		for (Component element : comps) {
-			if (element.getClass().isAssignableFrom(componentClass)) {
-				return element;
+			if (componentClass.isInstance(element)) {
+				return componentClass.cast(element);
 			}
 			else if (element instanceof Container) {
-				Component subComp = getComponentOfType((Container) element, componentClass);
+				T subComp = getComponentOfType((Container) element, componentClass);
 				if (subComp != null) {
 					return subComp;
 				}