diff --git a/src/itdelatrisu/opsu/states/Game.java b/src/itdelatrisu/opsu/states/Game.java
index 823b1c7c..2f2a90fe 100644
--- a/src/itdelatrisu/opsu/states/Game.java
+++ b/src/itdelatrisu/opsu/states/Game.java
@@ -1551,9 +1551,9 @@ public class Game extends BasicGameState {
 
 		Dancer.instance.setGameObjects(gameObjects);
 		sbOverlay.setGameObjects(gameObjects);
-		sbOverlay.updateIndex(objectIndex);
 		if (!skippedToCheckpoint) {
 			sbOverlay.enter();
+			sbOverlay.updateIndex(0);
 		}
 
 		Pippi.reset();
diff --git a/src/yugecin/opsudance/ui/SBOverlay.java b/src/yugecin/opsudance/ui/SBOverlay.java
index 829a9f46..b7904427 100644
--- a/src/yugecin/opsudance/ui/SBOverlay.java
+++ b/src/yugecin/opsudance/ui/SBOverlay.java
@@ -198,18 +198,18 @@ public class SBOverlay implements OptionsOverlay.Parent {
 			}
 		} else if (key == Input.KEY_J && index > 0) {
 			index--;
-			setMusicPosition();
 			goBackOneSBIndex();
+			setMusicPosition();
 		} else if (key == Input.KEY_K && index < gameObjects.length - 1) {
 			index++;
-			setMusicPosition();
 			updateIndex(index);
+			setMusicPosition();
 		}
 		return false;
 	}
 
 	private void goBackOneSBIndex() {
-		if (index + 1 < optionsMap.length && optionsMap[index + 1] != null) {
+		if (index + 1 < optionsMap.length) {
 			// new options on previous index, so to revert then we have to reload them all to this point..
 			reloadSBsettingsToIndex(index);
 		}