diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/table/TableServicePlugin.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/table/TableServicePlugin.java
index a3d0d9580e..b267a6880b 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/table/TableServicePlugin.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/table/TableServicePlugin.java
@@ -138,13 +138,7 @@ public class TableServicePlugin extends ProgramPlugin
 			GhidraProgramTableModel<T> model, String windowSubMenu, Navigatable navigatable) {
 
 		GoToService gotoService = tool.getService(GoToService.class);
-
-		if (gotoService != null && navigatable == null) {
-			navigatable = gotoService.getDefaultNavigatable();
-		}
-
 		Program program = model.getProgram();
-
 		TableComponentProvider<T> cp = new TableComponentProvider<>(this, title, tableTypeName,
 			model, program.getDomainFile().getName(), gotoService, windowSubMenu, navigatable);
 		addProvider(program, cp);
@@ -157,14 +151,8 @@ public class TableServicePlugin extends ProgramPlugin
 			String windowSubMenu, Navigatable navigatable) {
 
 		GoToService gotoService = tool.getService(GoToService.class);
-
-		if (gotoService != null && navigatable == null) {
-			navigatable = gotoService.getDefaultNavigatable();
-		}
-
 		MarkerService markerService = tool.getService(MarkerService.class);
 		Program program = model.getProgram();
-
 		TableComponentProvider<T> cp = new TableComponentProvider<>(this, title, tableTypeName,
 			model, program.getDomainFile().getName(), gotoService, markerService, markerColor,
 			markerIcon, windowSubMenu, navigatable);
diff --git a/Ghidra/Features/Base/src/main/java/ghidra/util/table/GhidraTable.java b/Ghidra/Features/Base/src/main/java/ghidra/util/table/GhidraTable.java
index 86cd71410f..9b6198b48c 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/util/table/GhidraTable.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/util/table/GhidraTable.java
@@ -127,7 +127,7 @@ public class GhidraTable extends GTable {
 			return;
 		}
 
-		if (this.navigatable == null) {
+		if (navigationKeyListener == null) {
 			navigationKeyListener = new KeyAdapter() {
 				@Override
 				public void keyPressed(KeyEvent e) {