diff --git a/stepmania/src/ScreenEdit.cpp b/stepmania/src/ScreenEdit.cpp
index 2841993615..e168677695 100644
--- a/stepmania/src/ScreenEdit.cpp
+++ b/stepmania/src/ScreenEdit.cpp
@@ -1158,7 +1158,8 @@ void ScreenEdit::InputEdit( const DeviceInput& DeviceI, const InputEventType typ
 		SOUNDMAN->PlayMusic("");
 		SOUNDMAN->PlayMusic( m_pSong->GetMusicPath(), false,
 			m_pSong->m_fMusicSampleStartSeconds,
-			m_pSong->m_fMusicSampleLengthSeconds );
+			m_pSong->m_fMusicSampleLengthSeconds,
+			1.5f );
 		break;
 	case SDLK_LEFTBRACKET:
 	case SDLK_RIGHTBRACKET:
diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp
index 77d212c027..307863c43c 100644
--- a/stepmania/src/ScreenSelectMusic.cpp
+++ b/stepmania/src/ScreenSelectMusic.cpp
@@ -871,7 +871,8 @@ void ScreenSelectMusic::PlayMusicSample()
 	{
 		SOUNDMAN->PlayMusic(pSong->GetMusicPath(), true,
 			pSong->m_fMusicSampleStartSeconds,
-			pSong->m_fMusicSampleLengthSeconds);
+			pSong->m_fMusicSampleLengthSeconds,
+			1.5f); /* fade out for 1.5 seconds */
 	}
 //	else
 //		SOUNDMAN->PlayMusic( THEME->GetPathTo("Sounds","select music music") );