diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index b61a3644d..058b04377 100755
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,5 +1,9 @@
 D2X-Rebirth Changelog
 
+20070523
+--------
+arch/ogl/gr.c: make sure gl functions are not called before OpenGL is initialised, when fullscreen switching
+
 20070522
 --------
 SConstruct: Added conditions to add compiler/linker flags from user's environemnt if they have any set.
diff --git a/arch/ogl/gr.c b/arch/ogl/gr.c
index c1cb775ed..b159b35c7 100755
--- a/arch/ogl/gr.c
+++ b/arch/ogl/gr.c
@@ -89,7 +89,7 @@ int gr_toggle_fullscreen(void){
 	gr_do_fullscreen(!ogl_fullscreen);
 	//	grd_curscreen->sc_mode=0;//hack to get it to reset screen mode
 
-	if (Screen_mode != SCREEN_GAME) // update viewing values for menus
+	if (gl_initialized && Screen_mode != SCREEN_GAME) // update viewing values for menus
 	{
 		glMatrixMode(GL_PROJECTION);
 		glLoadIdentity();