diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 31aebcf1e..3b2296c55 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -3,7 +3,7 @@ D1X-Rebirth Changelog
 20100624
 --------
 arch/ogl/gr.c, arch/sdl/gr.c, include/gr.h, main/menu.c: Added function to list valid resolutions and build resolutions menu dynamically with the resulting list
-main/gamecntl.c: When inregulary exiting a level by warp cheat, set canvas to NULL so cockpit canvas will not apply furthermore
+main/gamecntl.c: When inregulary exiting a level by warp cheat, suspend Game_wind and reactivate again after the switch
 
 20100623
 --------
diff --git a/main/gamecntl.c b/main/gamecntl.c
index 6d914c2c2..36c46ca02 100644
--- a/main/gamecntl.c
+++ b/main/gamecntl.c
@@ -1104,8 +1104,9 @@ void FinalCheats(int key)
 					new_level_num = atoi(m.text);
 					if (new_level_num!=0 && new_level_num>=0 && new_level_num<=Last_level)
 					{
-						gr_set_current_canvas(NULL); // get out of cockpit canvas
+						window_set_visible(Game_wind, 0);
 						StartNewLevel(new_level_num);
+						window_set_visible(Game_wind, 1);
 					}
 				}