diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 13e70e075..00ba66020 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -3,6 +3,7 @@ D1X-Rebirth Changelog
 20080602
 --------
 main/inferno.c: Added d1xrdata.zip for custom data
+arch/sdl/jukebox.c: Only stop music at jukebox_stop() if MIDI jukebox_loaded - otherwise user can stop Jukebox with keys but not start it again
 
 20080601
 --------
diff --git a/arch/sdl/jukebox.c b/arch/sdl/jukebox.c
index e97ef117a..dbac13301 100644
--- a/arch/sdl/jukebox.c
+++ b/arch/sdl/jukebox.c
@@ -141,7 +141,7 @@ void jukebox_play(int loop) {
 }
 
 void jukebox_stop() {
-	//if (!jukebox_loaded) return;	// since this function is also used for stopping MIDI
+	if (!jukebox_loaded) return;	// since this function is also used for stopping MIDI
 	mix_stop_music();
 	if (jukebox_playing)
 		hud_message(MSGC_GAME_FEEDBACK, JUKEBOX_HUDMSG_STOPPED);