diff --git a/stepmania/src/ScreenNameEntryTraditional.cpp b/stepmania/src/ScreenNameEntryTraditional.cpp
index 03bf3e9247..74b62df1a9 100644
--- a/stepmania/src/ScreenNameEntryTraditional.cpp
+++ b/stepmania/src/ScreenNameEntryTraditional.cpp
@@ -573,16 +573,17 @@ void ScreenNameEntryTraditional::Finish( PlayerNumber pn )
 	UpdateSelectionText( pn ); /* hide NAME_ cursor */
 
 	CString selection = WStringToCString( m_sSelection[pn] );
-	TrimRight( selection, " " );
-	TrimLeft( selection, " " );
-
-	GAMESTATE->StoreRankingName( pn, selection );
 
 	// save last used ranking name
 	Profile* pProfile = PROFILEMAN->GetProfile(pn);
 	if( pProfile )
 		pProfile->m_sLastUsedHighScoreName = selection;
 
+	TrimRight( selection, " " );
+	TrimLeft( selection, " " );
+
+	GAMESTATE->StoreRankingName( pn, selection );
+
 	OFF_COMMAND( m_Keyboard[pn] );
 	for( int i = 0; i < (int)m_textAlphabet[pn].size(); ++i )
 		OFF_COMMAND( m_textAlphabet[pn][i] );