diff --git a/stepmania/src/ScreenNameEntry.cpp b/stepmania/src/ScreenNameEntry.cpp
index 8e98a3308e..8f9565f6f7 100644
--- a/stepmania/src/ScreenNameEntry.cpp
+++ b/stepmania/src/ScreenNameEntry.cpp
@@ -265,7 +265,14 @@ ScreenNameEntry::ScreenNameEntry()
 
 
 
-	m_Timer.SetTimer(TIMER_SECONDS);
+	if( !PREFSMAN->m_bMenuTimer )
+	{
+		m_Timer.SetTimer( 99 );
+		m_Timer.Update( 0 );
+		m_Timer.StopTimer();
+	}
+	else
+		m_Timer.SetTimer(TIMER_SECONDS);
 	m_Timer.SetXY( TIMER_X, TIMER_Y );
 	this->AddChild( &m_Timer );