diff --git a/stepmania/src/ScreenAttract.cpp b/stepmania/src/ScreenAttract.cpp
index 2715e05dfd..4739b39057 100644
--- a/stepmania/src/ScreenAttract.cpp
+++ b/stepmania/src/ScreenAttract.cpp
@@ -28,7 +28,7 @@ ScreenAttract::ScreenAttract( bool bResetGameState )
 void ScreenAttract::BeginScreen()
 {
 	GAMESTATE->VisitAttractScreen( m_sName );
-	ScreenAttract::SetAttractVolume( !GAMESTATE->IsTimeToPlayAttractSounds() );
+	ScreenAttract::SetAttractVolume( true );
 
 	ScreenWithMenuElements::BeginScreen();
 }
@@ -43,9 +43,16 @@ void ScreenAttract::Input( const InputEventPlus &input )
 void ScreenAttract::SetAttractVolume( bool bInAttract )
 {
 	if( bInAttract )
-		SOUNDMAN->SetVolumeOfNonCriticalSounds( 0.0f );  // mute attract sounds
+	{
+		if( GAMESTATE->IsTimeToPlayAttractSounds() )
+			SOUNDMAN->SetVolumeOfNonCriticalSounds( g_fSoundVolumeAttract );  // unmute attract sounds
+		else
+			SOUNDMAN->SetVolumeOfNonCriticalSounds( 0.0f );  // mute attract sounds
+	}
 	else
-		SOUNDMAN->SetVolumeOfNonCriticalSounds( g_fSoundVolumeAttract );  // unmute attract sounds
+	{
+		SOUNDMAN->SetVolumeOfNonCriticalSounds( 1.0f );  // unmute all sounds
+	}
 }
 
 void ScreenAttract::AttractInput( const InputEventPlus &input, ScreenWithMenuElements *pScreen )
diff --git a/stepmania/src/ScreenDemonstration.cpp b/stepmania/src/ScreenDemonstration.cpp
index 4a5c330149..3be32f0474 100644
--- a/stepmania/src/ScreenDemonstration.cpp
+++ b/stepmania/src/ScreenDemonstration.cpp
@@ -25,7 +25,7 @@ void ScreenDemonstration::Init()
 {
 	GAMESTATE->Reset();
 	GAMESTATE->VisitAttractScreen( m_sName );
-	ScreenAttract::SetAttractVolume( !GAMESTATE->IsTimeToPlayAttractSounds() );
+	ScreenAttract::SetAttractVolume( true );
 
 	// Choose a Style
 	{
diff --git a/stepmania/src/ScreenOptionsMasterPrefs.cpp b/stepmania/src/ScreenOptionsMasterPrefs.cpp
index 53ce9e432f..0f9c15b0f5 100644
--- a/stepmania/src/ScreenOptionsMasterPrefs.cpp
+++ b/stepmania/src/ScreenOptionsMasterPrefs.cpp
@@ -715,8 +715,8 @@ static void InitializeConfOptions()
 	/* Sound options */
 	ADD( ConfOption( "AttractSoundFrequency",	MovePref<AttractSoundFrequency>, "Never","Always","2 Times","3 Times","4 Times","5 Times" ) );
 	ADD( ConfOption( "SoundVolume",			SoundVolume,		"Silent","|10%","|20%","|30%","|40%","|50%","|60%","|70%","|80%","|90%","|100%" ) );
-	ADD( ConfOption( "SoundVolumeAttract",		SoundVolumeAttract,	"Silent","|10%","|20%","|30%","|40%","|50%","|60%","|70%","|80%","|90%","|100%" ) );
 	g_ConfOptions.back().m_iEffects = OPT_APPLY_SOUND;
+	ADD( ConfOption( "SoundVolumeAttract",		SoundVolumeAttract,	"Silent","|10%","|20%","|30%","|40%","|50%","|60%","|70%","|80%","|90%","|100%" ) );
 	{
 		ConfOption c( "GlobalOffsetSeconds",		GlobalOffsetSeconds );
 		for( int i = -100; i <= +100; i += 5 )