diff --git a/stepmania/src/ScreenSelectMaster.cpp b/stepmania/src/ScreenSelectMaster.cpp
index 130d5001af..d7b4101fe9 100644
--- a/stepmania/src/ScreenSelectMaster.cpp
+++ b/stepmania/src/ScreenSelectMaster.cpp
@@ -31,6 +31,8 @@ ScreenSelectMaster::ScreenSelectMaster( CString sClassName ) : ScreenSelect( sCl
 	NUM_CHOICES_ON_PAGE_1(m_sName,"NumChoicesOnPage1"),
 	CURSOR_OFFSET_X_FROM_ICON(m_sName,CURSOR_OFFSET_X_FROM_ICON_NAME,NUM_PLAYERS,NUM_CURSOR_PARTS),
 	CURSOR_OFFSET_Y_FROM_ICON(m_sName,CURSOR_OFFSET_Y_FROM_ICON_NAME,NUM_PLAYERS,NUM_CURSOR_PARTS),
+	OVERRIDE_LOCK_INPUT_SECONDS(m_sName,"OverrideLockInputSeconds"),
+	LOCK_INPUT_SECONDS(m_sName,"LockInputSeconds"),
 	PRE_SWITCH_PAGE_SECONDS(m_sName,"PreSwitchPageSeconds"),
 	POST_SWITCH_PAGE_SECONDS(m_sName,"PostSwitchPageSeconds"),
 	OVERRIDE_SLEEP_AFTER_TWEEN_OFF_SECONDS(m_sName,"OverrideSleepAfterTweenOffSeconds"),
@@ -256,10 +258,8 @@ void ScreenSelectMaster::Init()
 	this->UpdateSelectableChoices();
 
 	TweenOnScreen();
-	m_fLockInputSecs = 
-		THEME->HasMetric(m_sName,"LockInputSeconds") ?
-		THEME->GetMetricF(m_sName,"LockInputSeconds") : 
-		this->GetTweenTimeLeft();
+
+	m_fLockInputSecs = (bool)OVERRIDE_LOCK_INPUT_SECONDS ? LOCK_INPUT_SECONDS : this->GetTweenTimeLeft();
 }
 
 void ScreenSelectMaster::Update( float fDelta )
diff --git a/stepmania/src/ScreenSelectMaster.h b/stepmania/src/ScreenSelectMaster.h
index ca08c8d399..5e0d00af76 100644
--- a/stepmania/src/ScreenSelectMaster.h
+++ b/stepmania/src/ScreenSelectMaster.h
@@ -44,6 +44,8 @@ protected:
 	ThemeMetric<int>		NUM_CHOICES_ON_PAGE_1;
 	ThemeMetric2D<float>	CURSOR_OFFSET_X_FROM_ICON;
 	ThemeMetric2D<float>	CURSOR_OFFSET_Y_FROM_ICON;
+	ThemeMetric<bool>		OVERRIDE_LOCK_INPUT_SECONDS;
+	ThemeMetric<float>		LOCK_INPUT_SECONDS;
 	ThemeMetric<float>		PRE_SWITCH_PAGE_SECONDS;
 	ThemeMetric<float>		POST_SWITCH_PAGE_SECONDS;
 	ThemeMetric<bool>		OVERRIDE_SLEEP_AFTER_TWEEN_OFF_SECONDS;