diff --git a/stepmania/src/ScreenOptions.cpp b/stepmania/src/ScreenOptions.cpp
index 33dba58ba6..a1117e192e 100644
--- a/stepmania/src/ScreenOptions.cpp
+++ b/stepmania/src/ScreenOptions.cpp
@@ -850,6 +850,9 @@ void ScreenOptions::MenuStart( PlayerNumber pn, const InputEventType type )
 		switch( m_OptionsNavigation )
 		{
 		case NAV_THREE_KEY:
+			// don't wrap
+			if( iCurRow == m_Rows.size()-1 )
+				return;
 			MenuDown( pn, type );
 			break;
 		case NAV_TOGGLE_THREE_KEY: