diff --git a/src/k_kart.c b/src/k_kart.c
index d6b7befc1..34d25c9fc 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -207,7 +207,7 @@ void K_TimerInit(void)
 	}
 	else if (skipstats != 0 && bossintro == false)
 	{
-		S_StartSound(NULL, sfx_s26c); //sfx_endwrp
+		S_StartSound(NULL, sfx_s26c);
 	}
 
 	if ((gametyperules & (GTR_CATCHER|GTR_CIRCUIT)) == (GTR_CATCHER|GTR_CIRCUIT))
diff --git a/src/m_cond.c b/src/m_cond.c
index 33683d531..6be7dcf23 100644
--- a/src/m_cond.c
+++ b/src/m_cond.c
@@ -3113,8 +3113,6 @@ boolean M_UpdateUnlockablesAndExtraEmblems(boolean loud, boolean doall)
 		response++;
 	}
 
-	response += newkeys;
-
 	// Announce
 	if (response != 0)
 	{
@@ -3124,6 +3122,16 @@ boolean M_UpdateUnlockablesAndExtraEmblems(boolean loud, boolean doall)
 		}
 		return true;
 	}
+
+	if (newkeys != 0)
+	{
+		if (loud)
+		{
+			S_StartSound(NULL, sfx_keygen);
+		}
+		return true;
+	}
+
 	return false;
 }
 
diff --git a/src/menus/extras-challenges.c b/src/menus/extras-challenges.c
index 60f4265e7..e090a9e3c 100644
--- a/src/menus/extras-challenges.c
+++ b/src/menus/extras-challenges.c
@@ -648,7 +648,7 @@ void M_ChallengesTick(void)
 
 				if (gamedata->keyspending > 0)
 				{
-					S_StartSound(NULL, sfx_achiev);
+					S_StartSound(NULL, sfx_keygen);
 					gamedata->keyspending--;
 					gamedata->chaokeys++;
 					challengesmenu.unlockcount[CMC_CHAOANIM]++;
diff --git a/src/sounds.c b/src/sounds.c
index de2ada781..91f5c4278 100644
--- a/src/sounds.c
+++ b/src/sounds.c
@@ -1102,8 +1102,8 @@ sfxinfo_t S_sfx[NUMSFX] =
   {"typri2", false,  64, 16, -1, NULL, 0,        -1,  -1, LUMPERROR, ""}, // SA2 final boss-type typewriting
   {"eggspr", false,  64, 16, -1, NULL, 0,        -1,  -1, LUMPERROR, ""}, // Sonic Unleashed Trap Spring
   {"achiev", false, 204,  0, -1, NULL, 0,        -1,  -1, LUMPERROR, "Achievement"},
-  {"gpmetr", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR, ""}, // End of a "Tutorial Teleport"
-  {"endwrp", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR, ""}, // End of a "Tutorial Teleport"
+  {"keygen", false, 204,  0, -1, NULL, 0,        -1,  -1, LUMPERROR, "Key Generated"},
+  {"gpmetr", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR, ""},
 
   // SRB2Kart - Ring Box
   {"slot00", false, 64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR, "Bar"},
diff --git a/src/sounds.h b/src/sounds.h
index 86f012c11..9e1c7a52b 100644
--- a/src/sounds.h
+++ b/src/sounds.h
@@ -1170,8 +1170,8 @@ typedef enum
 	sfx_typri2,
 	sfx_eggspr,
 	sfx_achiev,
+	sfx_keygen,
 	sfx_gpmetr,
-	sfx_endwrp,
 
 	// SRB2Kart - Ring Box
 	sfx_slot00,