diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 7e4a7896c..271a13408 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,5 +1,9 @@
 D2X-Rebirth Changelog
 
+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
+
 20091211
 --------
 arch/linux/ukali.c: Fixing possible string overflow while using KALI_PROCESS_NAME
diff --git a/main/game.c b/main/game.c
index fc88f96df..744972569 100644
--- a/main/game.c
+++ b/main/game.c
@@ -1267,10 +1267,7 @@ int game_handler(window *wind, d_event *event, void *data)
 	}
 	
 	if (Function_mode != FMODE_GAME)
-	{
-		if (window_close(wind))
-			longjmp(LeaveGame,0);
-	}
+		longjmp(LeaveGame,0);
 
 	return 1;
 }
@@ -1290,6 +1287,7 @@ void game()
 			event_process();
 	}
 
+	window_close(Game_wind);
 	digi_stop_all();
 
 	if ( (Newdemo_state == ND_STATE_RECORDING) || (Newdemo_state == ND_STATE_PAUSED) )