diff --git a/stepmania/src/OptionRow.cpp b/stepmania/src/OptionRow.cpp
index ca32784b85..6160b61716 100644
--- a/stepmania/src/OptionRow.cpp
+++ b/stepmania/src/OptionRow.cpp
@@ -876,7 +876,16 @@ void OptionRow::Reload()
 
 void OptionRow::HandleMessage( const Message &msg )
 {
-	Reload();
+	bool bReload = false;
+	FOREACH_CONST( RString, m_pHand->m_vsReloadRowMessages, m )
+	{
+		if( *m == msg.GetName() )
+			bReload = true;
+	}
+	if( bReload )
+		Reload();
+
+	ActorFrame::HandleMessage( msg );
 }