diff --git a/jadx-gui/src/main/java/jadx/gui/ui/dialog/RenameDialog.java b/jadx-gui/src/main/java/jadx/gui/ui/dialog/RenameDialog.java
index 77193aca1..0fa188855 100644
--- a/jadx-gui/src/main/java/jadx/gui/ui/dialog/RenameDialog.java
+++ b/jadx-gui/src/main/java/jadx/gui/ui/dialog/RenameDialog.java
@@ -113,7 +113,12 @@ public class RenameDialog extends JDialog {
 	}
 
 	private boolean checkNewName() {
-		boolean valid = NameMapper.isValidIdentifier(renameField.getText());
+		String newName = renameField.getText();
+		if (newName.isEmpty()) {
+			// use empty name to reset rename (revert to original)
+			return true;
+		}
+		boolean valid = NameMapper.isValidIdentifier(newName);
 		if (renameBtn.isEnabled() != valid) {
 			renameBtn.setEnabled(valid);
 			renameField.putClientProperty("JComponent.outline", valid ? "" : "error");