diff --git a/stepmania/src/ScreenOptionsMaster.cpp b/stepmania/src/ScreenOptionsMaster.cpp
index ca632fae3c..4a2ebe78bf 100644
--- a/stepmania/src/ScreenOptionsMaster.cpp
+++ b/stepmania/src/ScreenOptionsMaster.cpp
@@ -138,7 +138,9 @@ void ScreenOptionsMaster::BeginFadingOut()
 
 	if( row.GetRowType() != OptionRow::ROW_EXIT )
 	{
-		const int iChoice = row.GetChoiceInRowWithFocus( GAMESTATE->m_MasterPlayerNumber );
+		int iChoice = row.GetChoiceInRowWithFocus( GAMESTATE->m_MasterPlayerNumber );
+		if( row.GetFirstItemGoesDown() )
+			iChoice--;
 		OptionRowHandler *pHand = OptionRowHandlers[iCurRow];
 		m_bExportWillSetANewScreen = pHand->HasScreen( iChoice );
 	}