From a19ec4dbaa5e711cf1304fb002932fb8bffe8138 Mon Sep 17 00:00:00 2001
From: dragonmacher <48328597+dragonmacher@users.noreply.github.com>
Date: Mon, 3 Nov 2025 18:44:21 -0500
Subject: [PATCH] GP-6087 - Fixed structure editor bug that caused the selected
 row to move on the screen

---
 .../app/plugin/core/compositeeditor/CompositeEditorPanel.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 -> {