diff --git a/Source/debug.cpp b/Source/debug.cpp
index 82ce46b46..e06bb5387 100644
--- a/Source/debug.cpp
+++ b/Source/debug.cpp
@@ -177,7 +177,7 @@ std::string DebugCmdWarpToLevel(const string_view parameter)
 	if (!setlevel && myPlayer.plrlevel == level)
 		return fmt::format("I did nothing but fulfilled your wish. You are already at level {}.", level);
 
-	StartNewLvl(MyPlayerId, (level != 21) ? interface_mode::WM_DIABNEXTLVL : interface_mode::WM_DIABTWARPUP, level);
+	StartNewLvl(MyPlayerId, (level != 21) ? interface_mode::WM_DIABNEXTLVL : interface_mode::WM_DIABTOWNWARP, level);
 	return fmt::format("Welcome to level {}.", level);
 }
 
@@ -204,7 +204,7 @@ std::string DebugCmdLoadMap(const string_view parameter)
 		if (level != quest._qslvl)
 			continue;
 
-		StartNewLvl(MyPlayerId, (quest._qlevel != 21) ? interface_mode::WM_DIABNEXTLVL : interface_mode::WM_DIABTWARPUP, quest._qlevel);
+		StartNewLvl(MyPlayerId, (quest._qlevel != 21) ? interface_mode::WM_DIABNEXTLVL : interface_mode::WM_DIABTOWNWARP, quest._qlevel);
 		ProcessMessages();
 
 		setlvltype = quest._qlvltype;
diff --git a/Source/interfac.cpp b/Source/interfac.cpp
index bc39d90f1..97bdc1d82 100644
--- a/Source/interfac.cpp
+++ b/Source/interfac.cpp
@@ -344,6 +344,7 @@ void ShowProgress(interface_mode uMsg)
 		}
 		IncProgress();
 		FreeGameMem();
+		setlevel = false;
 		currlevel = myPlayer.plrlevel;
 		leveltype = gnLevelTypeTbl[currlevel];
 		IncProgress();
@@ -359,7 +360,6 @@ void ShowProgress(interface_mode uMsg)
 		}
 		IncProgress();
 		FreeGameMem();
-		setlevel = false;
 		currlevel = myPlayer.plrlevel;
 		leveltype = gnLevelTypeTbl[currlevel];
 		IncProgress();