diff --git a/Docs/Changelog_sm5.txt b/Docs/Changelog_sm5.txt
index cc56097497..8b66d59e83 100644
--- a/Docs/Changelog_sm5.txt
+++ b/Docs/Changelog_sm5.txt
@@ -9,6 +9,11 @@ ________________________________________________________________________________
 StepMania 5.0 alpha 2 | 201203??
 --------------------------------------------------------------------------------
 
+2012/03/09
+----------
+* [PlayerOptions] Don't display x-mods when using m-mods.
+  Sourced from hanubeki-modified-sm-ssc rev. bd08a58dd7cf and OpenITG.
+
 2012/03/08
 ----------
 * [MusicWheel] Added RouletteStopped message, which is broadcast when Roulette
diff --git a/src/PlayerOptions.cpp b/src/PlayerOptions.cpp
index ee936cd47c..35ad7c50ed 100644
--- a/src/PlayerOptions.cpp
+++ b/src/PlayerOptions.cpp
@@ -123,7 +123,7 @@ void PlayerOptions::GetMods( vector<RString> &AddTo, bool bForceNoteSkin ) const
 			RString s = ssprintf( "m%.0f", m_fMaxScrollBPM );
 			AddTo.push_back( s );
 		}
-		if( m_bSetScrollSpeed || m_fScrollSpeed != 1 )
+		else if( m_bSetScrollSpeed || m_fScrollSpeed != 1 )
 		{
 			/* -> 1.00 */
 			RString s = ssprintf( "%2.2f", m_fScrollSpeed );