diff --git a/stepmania/src/ScreenOptions.cpp b/stepmania/src/ScreenOptions.cpp
index 986553387b..63b5781a01 100644
--- a/stepmania/src/ScreenOptions.cpp
+++ b/stepmania/src/ScreenOptions.cpp
@@ -1041,6 +1041,8 @@ void ScreenOptions::MoveRow( PlayerNumber pn, int dir, bool Repeat )
 		wrap( r, m_Rows.size() );
 
 		const unsigned iOldSelection = row.GetChoiceInRowWithFocus(p);
+		if( m_iCurrentRow[p] == r )
+			continue;
 
 		m_iCurrentRow[p] = r;
 		ASSERT( r >= 0 && r < (int)m_Rows.size() );