diff --git a/src/itdelatrisu/opsu/states/Game.java b/src/itdelatrisu/opsu/states/Game.java
index 2f2a90fe..823b1c7c 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 be723493..829a9f46 100644
--- a/src/yugecin/opsudance/ui/SBOverlay.java
+++ b/src/yugecin/opsudance/ui/SBOverlay.java
@@ -300,7 +300,8 @@ public class SBOverlay implements OptionsOverlay.Parent {
 				if (optionsMap[index].size() == 0) {
 					optionsMap[index] = null;
 				}
-				reloadSBsettingsToIndex(index);
+				updateIndex(index - 1);
+				updateIndex(index);
 				return true;
 			}
 			ypos += lh;