diff --git a/enigma-swing/src/main/java/org/quiltmc/enigma/gui/GuiController.java b/enigma-swing/src/main/java/org/quiltmc/enigma/gui/GuiController.java
index 3fd9d9ec..8a836ec1 100644
--- a/enigma-swing/src/main/java/org/quiltmc/enigma/gui/GuiController.java
+++ b/enigma-swing/src/main/java/org/quiltmc/enigma/gui/GuiController.java
@@ -550,7 +550,7 @@ private void applyChange0(ValidationContext vc, EntryChange<?> change, boolean u
 			boolean renamed = !change.getDeobfName().isUnchanged();
 			this.gui.updateStructure(this.gui.getActiveEditor());
 			if (this.gui.getActiveEditor() != null) {
-				this.gui.getActiveEditor().onRename();
+				this.gui.getActiveEditor().onRename(prev.targetName() == null && mapping.targetName() != null);
 			}
 
 			if (!Objects.equals(prev.targetName(), mapping.targetName()) || !Objects.equals(prev.tokenType(), mapping.tokenType())) {
diff --git a/enigma-swing/src/main/java/org/quiltmc/enigma/gui/element/NavigatorPanel.java b/enigma-swing/src/main/java/org/quiltmc/enigma/gui/element/NavigatorPanel.java
index dc6fcad3..28bceb3e 100644
--- a/enigma-swing/src/main/java/org/quiltmc/enigma/gui/element/NavigatorPanel.java
+++ b/enigma-swing/src/main/java/org/quiltmc/enigma/gui/element/NavigatorPanel.java
@@ -109,6 +109,10 @@ private void wrapIndex() {
 		}
 	}
 
+	public void decrementIndex() {
+		this.currentIndex--;
+	}
+
 	private void tryNavigate() {
 		this.gui.getController().navigateTo(this.entries.get(this.selectedType).get(this.currentIndex));
 		this.updateStatsLabel();
diff --git a/enigma-swing/src/main/java/org/quiltmc/enigma/gui/panel/EditorPanel.java b/enigma-swing/src/main/java/org/quiltmc/enigma/gui/panel/EditorPanel.java
index ca8f1515..e4bb28c0 100644
--- a/enigma-swing/src/main/java/org/quiltmc/enigma/gui/panel/EditorPanel.java
+++ b/enigma-swing/src/main/java/org/quiltmc/enigma/gui/panel/EditorPanel.java
@@ -208,8 +208,9 @@ public void keyReleased(KeyEvent event) {
 		this.ui.putClientProperty(EditorPanel.class, this);
 	}
 
-	public void onRename() {
+	public void onRename(boolean isNewMapping) {
 		this.navigatorPanel.updateAllTokenTypes();
+		if (isNewMapping) this.navigatorPanel.decrementIndex();
 	}
 
 	@Nullable