diff --git a/source/frontend/credits.cpp b/source/frontend/credits.cpp
index c8f86614a..f55e95c9d 100644
--- a/source/frontend/credits.cpp
+++ b/source/frontend/credits.cpp
@@ -56,6 +56,10 @@
 #include "frontend\scrollbg.h"
 #endif
 
+#ifndef	__SOUND_SOUND_H__
+#include "sound\sound.h"
+#endif
+
 
 /*	Std Lib
 	------- */
@@ -307,6 +311,9 @@ mode=mode_none;
 	m_frame=DELAY_TIME;
 
 	m_shuttingDown=false;
+
+	CSoundMediator::setSong(CSoundMediator::SONG_GAMECOMPLETE);
+	CSoundMediator::playSong();
 }
 
 /*----------------------------------------------------------------------
@@ -321,6 +328,8 @@ void CFrontEndCredits::unselect()
 MemCard::Stop();
 delete sl;	
 #endif
+	CSoundMediator::dumpSong();
+
 	m_background2->shutdown();		delete m_background2;
 	m_background1->shutdown();		delete m_background1;
 
diff --git a/source/frontend/maintitl.cpp b/source/frontend/maintitl.cpp
index 5868be72a..2cf40a915 100644
--- a/source/frontend/maintitl.cpp
+++ b/source/frontend/maintitl.cpp
@@ -194,7 +194,7 @@ void CFrontEndMainTitles::select()
 	ASSERT(s_image);
 	SetScreenImage(s_image);
 
-	CSoundMediator::setSong(CSoundMediator::SONG_OPTIONS);
+	CSoundMediator::setSong(CSoundMediator::SONG_TITLE);
 	m_musicStarted=false;
 
 	CFader::setFadingIn();