diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 8cc39b1d6..7c948783b 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,5 +1,9 @@
 D1X-Rebirth Changelog
 
+20091213
+--------
+main/game.c: Make sure the Game_wind only gets freed once when escaping demo playback
+
 20091212
 --------
 main/game.c: Make sure the Game_wind always gets freed when exiting the game screen, fixing flashing automap and framerate reduction after playing demos
diff --git a/main/game.c b/main/game.c
index e2ab03a3c..207702146 100644
--- a/main/game.c
+++ b/main/game.c
@@ -1077,7 +1077,6 @@ void game()
 			event_process();
 	}
 
-	window_close(wind);
 	digi_stop_all();
 
 	if ( (Newdemo_state == ND_STATE_RECORDING) || (Newdemo_state == ND_STATE_PAUSED) )
@@ -1092,6 +1091,8 @@ void game()
 
 	clear_warn_func(game_show_warning);     //don't use this func anymore
 	game_disable_cheats();
+	
+	window_close(Game_wind);
 }
 
 //called at the end of the program