diff --git a/stepmania/src/OptionRow.cpp b/stepmania/src/OptionRow.cpp
index 6de3e06f13..4e350f7697 100644
--- a/stepmania/src/OptionRow.cpp
+++ b/stepmania/src/OptionRow.cpp
@@ -431,6 +431,9 @@ void OptionRow::AfterImportOptions()
 			m_Underline[p][c]->SetHidden( true );
 	}
 
+	FOREACH_HumanPlayer( p )
+		PositionUnderlines( p );
+
 	// Make all selections the same if bOneChoiceForAllPlayers
 	// Hack: we only import active players, so if only player 2 is imported,
 	// we need to copy p2 to p1, not p1 to p2.
diff --git a/stepmania/src/ScreenOptions.cpp b/stepmania/src/ScreenOptions.cpp
index 1a0c87e03a..ea9824f87a 100644
--- a/stepmania/src/ScreenOptions.cpp
+++ b/stepmania/src/ScreenOptions.cpp
@@ -302,7 +302,6 @@ void ScreenOptions::BeginScreen()
 	CHECKPOINT;
 
 	PositionRows();
-	PositionAllUnderlines();
 	PositionIcons();
 	RefreshAllIcons();
 	PositionCursors();