diff --git a/src/sdl/i_video.c b/src/sdl/i_video.c
index c2d964dab..6be60d6b9 100644
--- a/src/sdl/i_video.c
+++ b/src/sdl/i_video.c
@@ -712,11 +712,6 @@ static void I_CheckDesktopRes(void)
 	int currentDisplayIndex = -1;
 	SDL_DisplayMode curmode;
 
-	if (desktopwidth == vid.width && desktopheight == vid.height)
-	{
-		return;
-	}
-
 	desktopwidth = 0;
 	desktopheight = 0;
 
diff --git a/src/sdl/ogl_sdl.c b/src/sdl/ogl_sdl.c
index 0e08ac582..3c7834c3d 100644
--- a/src/sdl/ogl_sdl.c
+++ b/src/sdl/ogl_sdl.c
@@ -312,7 +312,8 @@ void OglSdlFinishUpdate(boolean waitvbl)
 
 #if defined (__unix__)
 #ifdef USE_FBO_OGL
-		xwaylandcrap = false;
+		if (loaded_config == true)
+			xwaylandcrap = false;
 #endif
 #endif
 }