From 5582436349653b092f7f52d1f216daeb77d34336 Mon Sep 17 00:00:00 2001
From: dragonmacher <48328597+dragonmacher@users.noreply.github.com>
Date: Fri, 22 Sep 2023 09:43:36 -0400
Subject: [PATCH] GP-3865 - Fixed bug in the Find Dialog that caused incorrect
 text to be selected when pressing Enter for a previous match

---
 .../Docking/src/main/java/docking/widgets/FindDialog.java      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/FindDialog.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/FindDialog.java
index ccfce998e9..31a3ee88ac 100644
--- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/FindDialog.java
+++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/FindDialog.java
@@ -238,7 +238,6 @@ public class FindDialog extends ReusableDialogComponentProvider {
 
 		MutableComboBoxModel<String> model = (MutableComboBoxModel<String>) comboBox.getModel();
 		model.insertElementAt(text, 0);
-		model.setSelectedItem(text);
 
 		int size = model.getSize();
 		for (int i = 1; i < size; i++) {
@@ -249,5 +248,7 @@ public class FindDialog extends ReusableDialogComponentProvider {
 			}
 		}
 
+		// do this last since removing items may change the selected item
+		model.setSelectedItem(text);
 	}
 }