diff --git a/mm/2s2h/DeveloperTools/BetterMapSelect.c b/mm/2s2h/DeveloperTools/BetterMapSelect.c
index cc62e0bdc..bf79aaf96 100644
--- a/mm/2s2h/DeveloperTools/BetterMapSelect.c
+++ b/mm/2s2h/DeveloperTools/BetterMapSelect.c
@@ -16,6 +16,10 @@ void BetterMapSelect_LoadGame(MapSelectState* mapSelectState, u32 entrance, s32
 }
 
 void BetterMapSelect_LoadFileSelect(MapSelectState* mapSelectState) {
+    CVarSetInteger("gDeveloperTools.BetterMapSelect.CurrentScene", mapSelectState->currentScene);
+    CVarSetInteger("gDeveloperTools.BetterMapSelect.TopDisplayedScene", mapSelectState->topDisplayedScene);
+    CVarSetInteger("gDeveloperTools.BetterMapSelect.PageDownIndex", mapSelectState->pageDownIndex);
+    CVarSave();
     STOP_GAMESTATE(&mapSelectState->state);
     SET_NEXT_GAMESTATE(&mapSelectState->state, FileSelect_Init, sizeof(FileSelectState));
 }
diff --git a/mm/2s2h/DeveloperTools/WarpPoint.cpp b/mm/2s2h/DeveloperTools/WarpPoint.cpp
index d74573335..c1e57ae2a 100644
--- a/mm/2s2h/DeveloperTools/WarpPoint.cpp
+++ b/mm/2s2h/DeveloperTools/WarpPoint.cpp
@@ -39,6 +39,7 @@ void RenderWarpPointSection() {
         CVarSetFloat(CV "Z", player->actor.world.pos.z);
         CVarSetFloat(CV "Rotation", player->actor.shape.rot.y);
         CVarSetInteger(CV "Saved", 1);
+        Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
     }
     if (CVarGetInteger(CV "Saved", 0)) {
         u32 sceneId = Entrance_GetSceneIdAbsolute(CVarGetInteger(CV "Entrance", ENTRANCE(SOUTH_CLOCK_TOWN, 0)));
@@ -53,6 +54,7 @@ void RenderWarpPointSection() {
             CVarClear(CV "Z");
             CVarClear(CV "Rotation");
             CVarClear(CV "Saved");
+            Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
         }
         ImGui::SameLine();
         if (UIWidgets::Button("Warp", { .size = UIWidgets::Sizes::Inline })) {