diff --git a/OpenTaiko/Lang/de/lang.json b/OpenTaiko/Lang/de/lang.json
index d983e6fa..f45a9951 100644
--- a/OpenTaiko/Lang/de/lang.json
+++ b/OpenTaiko/Lang/de/lang.json
@@ -445,7 +445,7 @@
 		"HEYA_DAN": "Dan-Titel",
 		"HEYA_NAMEPLATE": "Namensschild-Titel",
 		"HEYA_NAME": "Name",
-		"HEYA_NAME_INFO": "Type your name (Confirm to save, Cancel to discard changes):",
+		"HEYA_NAME_INFO": "Type your name (Enter to save, Escape to discard changes):",
 
 		// {0}: Asset name
 		"HEYA_DESCRIPTION_NAME": "Name: {0}",
diff --git a/OpenTaiko/Lang/en/lang.json b/OpenTaiko/Lang/en/lang.json
index a5181c6a..8a4ff715 100644
--- a/OpenTaiko/Lang/en/lang.json
+++ b/OpenTaiko/Lang/en/lang.json
@@ -445,7 +445,7 @@
 		"HEYA_DAN": "Dan Title",
 		"HEYA_NAMEPLATE": "Nameplate Title",
 		"HEYA_NAME": "Name",
-		"HEYA_NAME_INFO": "Type your name (Confirm to save, Cancel to discard changes):",
+		"HEYA_NAME_INFO": "Type your name (Enter to save, Escape to discard changes):",
 
 		// {0}: Asset name
 		"HEYA_DESCRIPTION_NAME": "Name: {0}",
diff --git a/OpenTaiko/Lang/es/lang.json b/OpenTaiko/Lang/es/lang.json
index 62b211fd..1886dc28 100644
--- a/OpenTaiko/Lang/es/lang.json
+++ b/OpenTaiko/Lang/es/lang.json
@@ -446,7 +446,7 @@
 		"HEYA_DAN": "Título de Dan",
 		"HEYA_NAMEPLATE": "Título de la placa",
 		"HEYA_NAME": "Name",
-		"HEYA_NAME_INFO": "Type your name (Confirm to save, Cancel to discard changes):",
+		"HEYA_NAME_INFO": "Type your name (Enter to save, Escape to discard changes):",
 
 		// {0}: Asset name
 		"HEYA_DESCRIPTION_NAME": "Name: {0}",
diff --git a/OpenTaiko/Lang/fr/lang.json b/OpenTaiko/Lang/fr/lang.json
index da5e1637..9b0d78db 100644
--- a/OpenTaiko/Lang/fr/lang.json
+++ b/OpenTaiko/Lang/fr/lang.json
@@ -445,7 +445,7 @@
 		"HEYA_DAN": "Titre Dan",
 		"HEYA_NAMEPLATE": "Titre",
 		"HEYA_NAME": "Name",
-		"HEYA_NAME_INFO": "Type your name (Confirm to save, Cancel to discard changes):",
+		"HEYA_NAME_INFO": "Type your name (Enter to save, Escape to discard changes):",
 
 		// {0}: Asset name
 		"HEYA_DESCRIPTION_NAME": "Name: {0}",
diff --git a/OpenTaiko/Lang/ja/lang.json b/OpenTaiko/Lang/ja/lang.json
index 0d4feaf8..c0e9cc94 100644
--- a/OpenTaiko/Lang/ja/lang.json
+++ b/OpenTaiko/Lang/ja/lang.json
@@ -445,7 +445,7 @@
 		"HEYA_DAN": "段位称号",
 		"HEYA_NAMEPLATE": "名札称号",
 		"HEYA_NAME": "名前",
-		"HEYA_NAME_INFO": "Type your name (Confirm to save, Cancel to discard changes):",
+		"HEYA_NAME_INFO": "Type your name (Enter to save, Escape to discard changes):",
 
 		// {0}: Asset name
 		"HEYA_DESCRIPTION_NAME": "名前：{0}",
diff --git a/OpenTaiko/Lang/ko/lang.json b/OpenTaiko/Lang/ko/lang.json
index ea8b0600..347e7267 100644
--- a/OpenTaiko/Lang/ko/lang.json
+++ b/OpenTaiko/Lang/ko/lang.json
@@ -445,7 +445,7 @@
 		"HEYA_DAN": "단위 제목",
 		"HEYA_NAMEPLATE": "칭호 타이틀",
 		"HEYA_NAME": "Name",
-		"HEYA_NAME_INFO": "Type your name (Confirm to save, Cancel to discard changes):",
+		"HEYA_NAME_INFO": "Type your name (Enter to save, Escape to discard changes):",
 
 		// {0}: Asset name
 		"HEYA_DESCRIPTION_NAME": "이름: {0}",
diff --git a/OpenTaiko/Lang/nl/lang.json b/OpenTaiko/Lang/nl/lang.json
index fb5eb4fe..cdbe2b29 100644
--- a/OpenTaiko/Lang/nl/lang.json
+++ b/OpenTaiko/Lang/nl/lang.json
@@ -441,7 +441,7 @@
 		"HEYA_DAN": "Dan Title",
 		"HEYA_NAMEPLATE": "Nameplate Title",
 		"HEYA_NAME": "Name",
-		"HEYA_NAME_INFO": "Type your name (Confirm to save, Cancel to discard changes):",
+		"HEYA_NAME_INFO": "Type your name (Enter to save, Escape to discard changes):",
 
 		// {0}: Asset name
 		"HEYA_DESCRIPTION_NAME": "Name: {0}",
diff --git a/OpenTaiko/Lang/ru/lang.json b/OpenTaiko/Lang/ru/lang.json
index 7cf7f8b6..7b078cda 100644
--- a/OpenTaiko/Lang/ru/lang.json
+++ b/OpenTaiko/Lang/ru/lang.json
@@ -445,7 +445,7 @@
 		"HEYA_DAN": "Ранг дан",
 		"HEYA_NAMEPLATE": "Ранг таблички",
 		"HEYA_NAME": "Имя",
-		"HEYA_NAME_INFO": "Введите своё имя («Выбрать», чтобы сохранить; «Отмена», чтобы отменить изменения):",
+		"HEYA_NAME_INFO": "Type your name (Enter to save, Escape to discard changes):",
 
 		// {0}: Asset name
 		"HEYA_DESCRIPTION_NAME": "Имя: {0}",
diff --git a/OpenTaiko/Lang/zh/lang.json b/OpenTaiko/Lang/zh/lang.json
index 90dba918..1c13d8fa 100644
--- a/OpenTaiko/Lang/zh/lang.json
+++ b/OpenTaiko/Lang/zh/lang.json
@@ -445,7 +445,7 @@
 		"HEYA_DAN": "段位称号",
 		"HEYA_NAMEPLATE": "名牌称号",
 		"HEYA_NAME": "姓名",
-		"HEYA_NAME_INFO": "输入您的姓名（确认保存，取消放弃更改）：",
+		"HEYA_NAME_INFO": "Type your name (Enter to save, Escape to discard changes):",
 
 		// {0}: Asset name
 		"HEYA_DESCRIPTION_NAME": "姓名：{0}",
diff --git a/OpenTaiko/src/Stages/11.Heya/CStageHeya.cs b/OpenTaiko/src/Stages/11.Heya/CStageHeya.cs
index 1b619475..d37c1bbc 100644
--- a/OpenTaiko/src/Stages/11.Heya/CStageHeya.cs
+++ b/OpenTaiko/src/Stages/11.Heya/CStageHeya.cs
@@ -557,8 +557,10 @@ class CStageHeya : CStage {
 			if (this.tMove(-1)) {
 				OpenTaiko.Skin.soundChangeSFX.tPlay();
 			}
-		} else if (OpenTaiko.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Return) ||
-				   OpenTaiko.Pad.bPressed(EInstrumentPad.Drums, EPad.Decide)) {
+		}
+		else if (iCurrentMenu != CurrentMenu.Name && (OpenTaiko.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Return) ||
+				   OpenTaiko.Pad.bPressed(EInstrumentPad.Drums, EPad.Decide)))
+		{
 
 			#region [Decide]
 
@@ -677,14 +679,6 @@ class CStageHeya : CStage {
 				iCurrentMenu = CurrentMenu.ReturnToMenu;
 				this.tResetOpts();
 			}
-			else if (iCurrentMenu == CurrentMenu.Name) {
-				OpenTaiko.SaveFileInstances[iPlayer].data.Name = textInput.Text;
-				OpenTaiko.SaveFileInstances[iPlayer].tApplyHeyaChanges();
-				OpenTaiko.NamePlate.tNamePlateRefreshTitles(iPlayer);
-
-				iCurrentMenu = CurrentMenu.ReturnToMenu;
-				this.tResetOpts();
-			}
 
 			if (ess == ESelectStatus.SELECTED)
 				OpenTaiko.Skin.soundDecideSFX.tPlay();
@@ -695,8 +689,9 @@ class CStageHeya : CStage {
 
 			#endregion
 		}
-		else if (OpenTaiko.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Escape) ||
-				   OpenTaiko.Pad.bPressed(EInstrumentPad.Drums, EPad.Cancel)) {
+		else if (iCurrentMenu != CurrentMenu.Name && (OpenTaiko.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Escape) ||
+				   OpenTaiko.Pad.bPressed(EInstrumentPad.Drums, EPad.Cancel)))
+		{
 
 			OpenTaiko.Skin.soundCancelSFX.tPlay();
 
@@ -714,6 +709,23 @@ class CStageHeya : CStage {
 
 			return 0;
 		}
+		else if (iCurrentMenu == CurrentMenu.Name && OpenTaiko.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Return)) {
+			OpenTaiko.SaveFileInstances[iPlayer].data.Name = textInput.Text;
+			OpenTaiko.SaveFileInstances[iPlayer].tApplyHeyaChanges();
+			OpenTaiko.NamePlate.tNamePlateRefreshTitles(iPlayer);
+
+			iCurrentMenu = CurrentMenu.ReturnToMenu;
+			this.tResetOpts();
+			OpenTaiko.Skin.soundDecideSFX.tPlay();
+			return 0;
+		}
+		else if (iCurrentMenu == CurrentMenu.Name && OpenTaiko.InputManager.Keyboard.KeyPressed((int)SlimDXKeys.Key.Escape)) {
+			OpenTaiko.Skin.soundDecideSFX.tPlay();
+			iCurrentMenu = CurrentMenu.ReturnToMenu;
+			this.ttkInfoSection = null;
+			this.tResetOpts();
+			return 0;
+		}
 
 		#endregion