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 2dd4fe4e2b..3e946e49a0 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
@@ -247,6 +247,7 @@ public abstract class CompositeEditorPanel<T extends Composite, M extends Compos
 		}
 
 		table.getSelectionModel().setSelectionInterval(row, row);
+		showSelectedRow();
 	}
 
 	private int findRowForFieldName(String fieldName) {
@@ -578,7 +579,6 @@ public abstract class CompositeEditorPanel<T extends Composite, M extends Compos
 			}
 
 			model.setSelection(table.getSelectedRows());
-			showSelectedRow();
 		});
 
 		table.getColumnModel().getSelectionModel().addListSelectionListener(e -> {