diff --git a/src/menu/playermenu.cpp b/src/menu/playermenu.cpp
index b23a4d4222..dab8f29fb3 100644
--- a/src/menu/playermenu.cpp
+++ b/src/menu/playermenu.cpp
@@ -899,11 +899,11 @@ void DPlayerMenu::ClassChanged (FListMenuItem *li)
 	if (li->GetValue(0, &sel))
 	{
 		players[consoleplayer].userinfo.PlayerClass = sel-1;
+		PickPlayerClass();
 
 		cvar_set ("playerclass", 
 			sel == 0 ? "Random" : PlayerClass->Type->Meta.GetMetaString (APMETA_DisplayName));
 
-		PickPlayerClass();
 		UpdateSkins();
 		UpdateColorsets();
 		UpdateTranslation();