diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/osgi/LessFreneticGTable.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/osgi/LessFreneticGTable.java
index 8f32417f24..dffa31dbdb 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/osgi/LessFreneticGTable.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/osgi/LessFreneticGTable.java
@@ -63,7 +63,11 @@ class LessFreneticGTable extends GTable {
 
 	@SuppressWarnings("unchecked")
 	@Override
-	protected <T> SelectionManager createSelectionManager(TableModel model) {
-		return new MySelectionManager<T>(this, (RowObjectTableModel<T>) model);
+	protected <T> SelectionManager createSelectionManager() {
+		TableModel model = getModel();
+		if (model instanceof RowObjectTableModel) {
+			return new MySelectionManager<T>(this, (RowObjectTableModel<T>) model);
+		}
+		return null;
 	}
 }