diff --git a/stepmania/src/BitmapText.cpp b/stepmania/src/BitmapText.cpp
index f77724498d..7f19aa0650 100644
--- a/stepmania/src/BitmapText.cpp
+++ b/stepmania/src/BitmapText.cpp
@@ -93,6 +93,11 @@ bool BitmapText::LoadFromTextureAndChars( CString sTexturePath, CString sChars )
 {
 	LOG->Trace( "BitmapText::LoadFromTextureAndChars(%s)", sTexturePath );
 
+	if( m_pFont ) {
+		FONT->UnloadFont( m_pFont->m_sTexturePath );
+		m_pFont = NULL;
+	}
+
 	// load font
 	m_pFont = FONT->LoadFont( sTexturePath, sChars );