diff --git a/stepmania/src/EditMenu.cpp b/stepmania/src/EditMenu.cpp
index 8af21e9db0..aeb6d82ce1 100644
--- a/stepmania/src/EditMenu.cpp
+++ b/stepmania/src/EditMenu.cpp
@@ -175,8 +175,8 @@ void EditMenu::Load( const CString &sType )
 	ActorUtil::SetXY( m_SourceMeter, sType );
 	this->AddChild( &m_SourceMeter );
 
-	m_soundChangeRow.Load( THEME->GetPathS(sType,"row") );
-	m_soundChangeValue.Load( THEME->GetPathS(sType,"value") );
+	m_soundChangeRow.Load( THEME->GetPathS(sType,"row"), true );
+	m_soundChangeValue.Load( THEME->GetPathS(sType,"value"), true );
 
 	//
 	// fill in data structures
@@ -279,7 +279,7 @@ void EditMenu::Up()
 			ChangeToRow( ROW_STEPS );
 		else
 			ChangeToRow( EditMenuRow(m_SelectedRow-1) );
-		m_soundChangeRow.PlayRandom();
+		m_soundChangeRow.Play();
 	}
 }
 
@@ -291,7 +291,7 @@ void EditMenu::Down()
 			ChangeToRow( ROW_ACTION );
 		else
 			ChangeToRow( EditMenuRow(m_SelectedRow+1) );
-		m_soundChangeRow.PlayRandom();
+		m_soundChangeRow.Play();
 	}
 }
 
@@ -302,7 +302,7 @@ void EditMenu::Left()
 		m_iSelection[m_SelectedRow]--;
 		wrap( m_iSelection[m_SelectedRow], GetRowSize(m_SelectedRow) );
 		OnRowValueChanged( m_SelectedRow );
-		m_soundChangeValue.PlayRandom();
+		m_soundChangeValue.Play();
 	}
 }
 
@@ -313,7 +313,7 @@ void EditMenu::Right()
 		m_iSelection[m_SelectedRow]++;
 		wrap( m_iSelection[m_SelectedRow], GetRowSize(m_SelectedRow) );
 		OnRowValueChanged( m_SelectedRow );
-		m_soundChangeValue.PlayRandom();
+		m_soundChangeValue.Play();
 	}
 }
 
diff --git a/stepmania/src/EditMenu.h b/stepmania/src/EditMenu.h
index c64be14d34..a4d8c23ea2 100644
--- a/stepmania/src/EditMenu.h
+++ b/stepmania/src/EditMenu.h
@@ -8,7 +8,7 @@
 #include "TextBanner.h"
 #include "GameConstantsAndTypes.h"
 #include "DifficultyMeter.h"
-#include "RandomSample.h"
+#include "RageSound.h"
 #include "EnumHelper.h"
 #include "ThemeMetric.h"
 #include "GameConstantsAndTypes.h"
@@ -112,8 +112,8 @@ private:
 	void OnRowValueChanged( EditMenuRow row );
 	void ChangeToRow( EditMenuRow newRow );
 
-	RandomSample	m_soundChangeRow;
-	RandomSample	m_soundChangeValue;
+	RageSound m_soundChangeRow;
+	RageSound m_soundChangeValue;
 
 	ThemeMetric<bool> SHOW_GROUPS;
 	ThemeMetric1D<float> ARROWS_X;
diff --git a/stepmania/src/ScreenSelectCharacter.cpp b/stepmania/src/ScreenSelectCharacter.cpp
index a4dae8a2e8..8fb7fb0f45 100644
--- a/stepmania/src/ScreenSelectCharacter.cpp
+++ b/stepmania/src/ScreenSelectCharacter.cpp
@@ -138,7 +138,7 @@ void ScreenSelectCharacter::Init()
 	this->AddChild( &m_sprExplanation );
 
 
-	m_soundChange.Load( THEME->GetPathS("ScreenSelectCharacter","change") );
+	m_soundChange.Load( THEME->GetPathS("ScreenSelectCharacter","change"), true );
 
 	SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("select group intro") );
 
@@ -312,7 +312,7 @@ void ScreenSelectCharacter::Move( PlayerNumber pn, int deltaValue )
 		m_iSelectedCharacter[pnAffected] += deltaValue;
 		wrap( m_iSelectedCharacter[pnAffected], apCharacters.size() );
 		AfterValueChange(pn);
-		m_soundChange.PlayRandom();
+		m_soundChange.Play();
 		break;
 	}
 }
diff --git a/stepmania/src/ScreenSelectCharacter.h b/stepmania/src/ScreenSelectCharacter.h
index 8e0ab9280f..07f2819c0b 100644
--- a/stepmania/src/ScreenSelectCharacter.h
+++ b/stepmania/src/ScreenSelectCharacter.h
@@ -5,7 +5,7 @@
 
 #include "ScreenWithMenuElements.h"
 #include "Sprite.h"
-#include "RandomSample.h"
+#include "RageSound.h"
 #include "GameConstantsAndTypes.h"
 #include "OptionIcon.h"
 #include "Banner.h"
@@ -63,7 +63,7 @@ private:
 
 	Sprite			m_sprExplanation;
 
-	RandomSample	m_soundChange;
+	RageSound		m_soundChange;
 };
 
 #endif
diff --git a/stepmania/src/ScreenSelectGroup.cpp b/stepmania/src/ScreenSelectGroup.cpp
index 8fbe0eefa6..5a8d393670 100644
--- a/stepmania/src/ScreenSelectGroup.cpp
+++ b/stepmania/src/ScreenSelectGroup.cpp
@@ -123,7 +123,7 @@ void ScreenSelectGroup::Init()
 	this->AddChild( &m_GroupList );
 
 
-	m_soundChange.Load( THEME->GetPathS("ScreenSelectGroup","change") );
+	m_soundChange.Load( THEME->GetPathS("ScreenSelectGroup","change"), true );
 
 	SOUND->PlayOnceFromAnnouncer( "select group intro" );
 
@@ -193,7 +193,7 @@ void ScreenSelectGroup::MenuUp( PlayerNumber pn )
 
 	AfterChange();
 
-	m_soundChange.PlayRandom();
+	m_soundChange.Play();
 }
 
 
@@ -206,7 +206,7 @@ void ScreenSelectGroup::MenuDown( PlayerNumber pn )
 	
 	AfterChange();
 
-	m_soundChange.PlayRandom();
+	m_soundChange.Play();
 }
 
 void ScreenSelectGroup::MenuStart( PlayerNumber pn )
diff --git a/stepmania/src/ScreenSelectGroup.h b/stepmania/src/ScreenSelectGroup.h
index e268efd6e5..e44f48eb28 100644
--- a/stepmania/src/ScreenSelectGroup.h
+++ b/stepmania/src/ScreenSelectGroup.h
@@ -5,7 +5,7 @@
 
 #include "ScreenWithMenuElements.h"
 #include "Sprite.h"
-#include "RandomSample.h"
+#include "RageSound.h"
 #include "FadingBanner.h"
 #include "MusicList.h"
 #include "GroupList.h"
@@ -43,7 +43,7 @@ private:
 	MusicList		m_MusicList;
 	GroupList		m_GroupList;
 
-	RandomSample m_soundChange;
+	RageSound m_soundChange;
 
 	bool m_bChosen;
 };