diff --git a/desktop_version/src/Music.cpp b/desktop_version/src/Music.cpp
index e6566b79..d162bf6e 100644
--- a/desktop_version/src/Music.cpp
+++ b/desktop_version/src/Music.cpp
@@ -414,7 +414,11 @@ void musicclass::niceplay(int t)
 	// important: do nothing if the correct song is playing!
 	if(currentsong!=t)
 	{
-		if(currentsong!=-1) fadeout();
+		if(currentsong!=-1)
+		{
+			dontquickfade = true;
+			fadeout();
+		}
 		nicefade = 1;
 		nicechange = t;
 	}