diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/compositeeditor/CompositeEditorPanel.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/compositeeditor/CompositeEditorPanel.java
index e31dd83199..0ea7fb1603 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/compositeeditor/CompositeEditorPanel.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/compositeeditor/CompositeEditorPanel.java
@@ -79,7 +79,7 @@ public abstract class CompositeEditorPanel extends JPanel
 
 	protected CompositeEditorProvider provider;
 	protected CompositeEditorModel model;
-	protected CompositeTable table;
+	protected GTable table;
 	private JLabel statusLabel;
 
 	private boolean editorAdjusting = false;
@@ -558,7 +558,7 @@ public abstract class CompositeEditorPanel extends JPanel
 	}
 
 	private void createTable() {
-		table = new CompositeTable(model);
+		table = new GTable(model);
 
 		TableColumnModel columnModel = table.getColumnModel();
 		if (columnModel instanceof GTableColumnModel) {
@@ -1332,7 +1332,7 @@ public abstract class CompositeEditorPanel extends JPanel
 
 		@Override
 		public void focusEditor() {
-			textField.requestFocusInWindow();
+			boolean didFocus = textField.requestFocusInWindow();
 		}
 
 		@Override
@@ -1490,20 +1490,4 @@ public abstract class CompositeEditorPanel extends JPanel
 			e.consume();
 		}
 	}
-
-	class CompositeTable extends GTable {
-
-		public CompositeTable(TableModel dm) {
-			super(dm);
-		}
-
-		@Override
-		// overridden because the editor component was not being given focus
-		public Component prepareEditor(TableCellEditor editor, int row, int column) {
-			final Component component = super.prepareEditor(editor, row, column);
-			Swing.runLater(() -> component.requestFocus());
-			return component;
-		}
-	}
-
 }