diff --git a/code/client/cl_keys.c b/code/client/cl_keys.c
index 38f41d03..72fdbe8b 100644
--- a/code/client/cl_keys.c
+++ b/code/client/cl_keys.c
@@ -1164,7 +1164,7 @@ void CL_KeyEvent (int key, qboolean down, unsigned time) {
 		{
 			if (keys[K_ALT].down)
 			{
-				Key_ClearStates();
+//				Key_ClearStates();  // Thilo: why should we clear the key states here?
 				Cvar_SetValue( "r_fullscreen",
 						!Cvar_VariableIntegerValue( "r_fullscreen" ) );
 				return;
diff --git a/code/sdl/sdl_glimp.c b/code/sdl/sdl_glimp.c
index 3f5ba12f..a6c0a302 100644
--- a/code/sdl/sdl_glimp.c
+++ b/code/sdl/sdl_glimp.c
@@ -662,6 +662,13 @@ void GLimp_EndFrame( void )
 				fullscreen = qtrue;
 			else
 				fullscreen = qfalse;
+				
+			if (r_fullscreen->integer && Cvar_VariableIntegerValue( "in_nograb" ))
+			{
+				ri.Printf( PRINT_ALL, "Fullscreen not allowed with in_nograb 1\n");
+				ri.Cvar_Set( "r_fullscreen", "0" );
+				r_fullscreen->modified = qfalse;
+			}
 
 			// Is the state we want different from the current state?
 			if( !!r_fullscreen->integer != fullscreen )