diff --git a/stepmania/src/ScreenNameEntry.cpp b/stepmania/src/ScreenNameEntry.cpp
index 9251dd0266..573537313c 100644
--- a/stepmania/src/ScreenNameEntry.cpp
+++ b/stepmania/src/ScreenNameEntry.cpp
@@ -255,10 +255,20 @@ void ScreenNameEntry::Init()
 	this->SortByDrawOrder();
 
 	m_soundStep.Load( THEME->GetPathS("ScreenNameEntry","step") );
-
+	m_sPathToMusic = THEME->GetPathS( m_sName, "music" );
 	m_fFakeBeat = 0;
 }
 
+void ScreenNameEntry::BeginScreen()
+{
+	SOUND->PlayMusic( m_sPathToMusic );
+}
+
+void ScreenNameEntry::EndScreen()
+{
+	SOUND->StopMusic();
+}
+
 bool ScreenNameEntry::AnyStillEntering() const
 {
 	FOREACH_PlayerNumber( p )
diff --git a/stepmania/src/ScreenNameEntry.h b/stepmania/src/ScreenNameEntry.h
index 7ffa9c7500..dfcd1c017b 100644
--- a/stepmania/src/ScreenNameEntry.h
+++ b/stepmania/src/ScreenNameEntry.h
@@ -23,6 +23,8 @@ public:
 	virtual void HandleScreenMessage( const ScreenMessage SM );
 
 	virtual void MenuStart( const InputEventPlus &input );
+	virtual void BeginScreen();
+	virtual void EndScreen();
 
 	enum { ABS_MAX_RANKING_NAME_LENGTH = 10 };
 private:
@@ -44,6 +46,7 @@ private:
 	bool			m_bStillEnteringName[NUM_PLAYERS];
 
 	vector<int>		m_ColToStringIndex[NUM_PLAYERS];
+	RString			m_sPathToMusic;
 };
 
 #endif