diff --git a/src/itdelatrisu/opsu/Opsu.java b/src/itdelatrisu/opsu/Opsu.java
index 3ddf0769..da7710dd 100644
--- a/src/itdelatrisu/opsu/Opsu.java
+++ b/src/itdelatrisu/opsu/Opsu.java
@@ -169,9 +169,13 @@ public class Opsu extends StateBasedGame {
 		// intercept close requests in game-related states and return to song menu
 		if (id == STATE_GAME || id == STATE_GAMEPAUSEMENU || id == STATE_GAMERANKING) {
 			// start playing track at preview position
-			((SongMenu) this.getState(Opsu.STATE_SONGMENU)).resetGameDataOnLoad();
-			MusicController.pause();
-			MusicController.resume();
+			SongMenu songMenu = (SongMenu) this.getState(Opsu.STATE_SONGMENU);
+			songMenu.resetGameDataOnLoad();
+			if (id == STATE_GAME) {
+				MusicController.pause();
+				MusicController.resume();
+			} else
+				songMenu.resetTrackOnLoad();
 			this.enterState(Opsu.STATE_SONGMENU, new FadeOutTransition(Color.black), new FadeInTransition(Color.black));
 			return false;
 		}