diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 4df3f8c11..e33058edc 100755
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -4,6 +4,7 @@ D2X-Rebirth Changelog
 --------
 SConstruct, arch/sdl/init.c, arch/sdl/joydefs.c, arch/sdl/mouse.c, arch/include/mouse.h, include/error.h, main/config.h main/game.c, main/gamecntl.c, main/inferno.c, main/kconfig.c, main/kconfig.h, main/newmenu.c, main/newmenu.h, main/playsave.c, main/text.h: Added config field to map a Mouse Axis/Wheel to cycle Primary and Secondary weapons; lots of controls-related code cleaning
 main/laser.c: fixed speeding bug in homing system
+main/game.c: make sure Game_window_w/h is always set to a valid value in every cockpit mode
 
 20070512
 --------
diff --git a/main/game.c b/main/game.c
index 18fab2f3f..b4f6b32b1 100755
--- a/main/game.c
+++ b/main/game.c
@@ -377,6 +377,10 @@ void init_cockpit()
 	switch( Cockpit_mode ) {
 	case CM_FULL_COCKPIT:
 	case CM_REAR_VIEW:
+		if (!Game_window_h)
+			Game_window_h = max_window_h;
+		if (!Game_window_w)
+			Game_window_w = max_window_w;
 		if (Cockpit_mode == CM_FULL_COCKPIT) {
 			game_init_render_sub_buffers(0, 0, grd_curscreen->sc_w,(grd_curscreen->sc_h*2)/3); 
 		}