diff --git a/stepmania/src/ScreenSelectMaster.cpp b/stepmania/src/ScreenSelectMaster.cpp
index 559de4a765..829cf35f53 100644
--- a/stepmania/src/ScreenSelectMaster.cpp
+++ b/stepmania/src/ScreenSelectMaster.cpp
@@ -259,7 +259,10 @@ ScreenSelectMaster::ScreenSelectMaster( CString sClassName ) : ScreenSelect( sCl
 	this->UpdateSelectableChoices();
 
 	TweenOnScreen();
-	m_fLockInputSecs = this->GetTweenTimeLeft();
+	m_fLockInputSecs = 
+		THEME->HasMetric(m_sName,"LockInputSeconds") ?
+		THEME->GetMetricF(m_sName,"LockInputSeconds") : 
+		this->GetTweenTimeLeft();
 }
 
 void ScreenSelectMaster::Update( float fDelta )