diff --git a/stepmania/src/ScreenOptions.cpp b/stepmania/src/ScreenOptions.cpp
index cc697bbabe..68a7485e77 100644
--- a/stepmania/src/ScreenOptions.cpp
+++ b/stepmania/src/ScreenOptions.cpp
@@ -276,6 +276,12 @@ void ScreenOptions::InitMenu( InputMode im, const vector<OptionRowDefinition> &v
 		}
 	}
 
+	// Hide highlight if no rows are enabled.
+	FOREACH_HumanPlayer( p )
+		if( m_iCurrentRow[p] == -1 )
+			m_sprLineHighlight[p].SetHidden( true );
+
+
 	CHECKPOINT;
 
 	PositionItems();