diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/EditFieldNameDialog.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/EditFieldNameDialog.java
index d3c16ded44..96964d1ab7 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/EditFieldNameDialog.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/EditFieldNameDialog.java
@@ -115,6 +115,7 @@ public class EditFieldNameDialog extends DialogComponentProvider {
 		String name = getCurrentFieldName();
 		setTitle("Edit Field Name: " + dataTypeComponent.getParent().getName() + "." + name);
 		fieldName.setText(name);
+		fieldName.selectAll();
 		clearStatusText();
 		tool.showDialog(this);
 	}