diff --git a/stepmania/src/ScreenNameEntry.cpp b/stepmania/src/ScreenNameEntry.cpp
index 68bbc2fe8e..9341ce817b 100644
--- a/stepmania/src/ScreenNameEntry.cpp
+++ b/stepmania/src/ScreenNameEntry.cpp
@@ -416,16 +416,16 @@ void ScreenNameEntry::MenuStart( PlayerNumber pn )
 
 	m_soundStep.Play();
 
-	TrimRight( m_sSelectedName[pn], " " );
-	TrimLeft( m_sSelectedName[pn], " " );
-
-	GAMESTATE->StoreRankingName( pn, m_sSelectedName[pn] );
-
 	// save last used ranking name
 	Profile* pProfile = PROFILEMAN->GetProfile(pn);
 	if( pProfile )
 		pProfile->m_sLastUsedHighScoreName = m_sSelectedName[pn];
 
+	TrimRight( m_sSelectedName[pn], " " );
+	TrimLeft( m_sSelectedName[pn], " " );
+
+	GAMESTATE->StoreRankingName( pn, m_sSelectedName[pn] );
+
 	if( !AnyStillEntering() && !m_Out.IsTransitioning() )
 		m_Out.StartTransitioning( SM_GoToNextScreen );
 }