diff --git a/desktop_version/src/KeyPoll.cpp b/desktop_version/src/KeyPoll.cpp
index b22467b2..5d152171 100644
--- a/desktop_version/src/KeyPoll.cpp
+++ b/desktop_version/src/KeyPoll.cpp
@@ -43,17 +43,6 @@ KeyPoll::KeyPoll(void)
 	resetWindow = 0;
 	pressedbackspace=false;
 
-	useFullscreenSpaces = false;
-	if (SDL_strcmp(SDL_GetPlatform(), "Mac OS X") == 0)
-	{
-		useFullscreenSpaces = true;
-		const char *hint = SDL_GetHint(SDL_HINT_VIDEO_MAC_FULLSCREEN_SPACES);
-		if (hint != NULL)
-		{
-			useFullscreenSpaces = (SDL_strcmp(hint, "1") == 0);
-		}
-	}
-
 	linealreadyemptykludge = false;
 
 	isActive = true;
@@ -288,7 +277,7 @@ void KeyPoll::Poll(void)
 					music.resume();
 					music.resumeef();
 				}
-				if (!useFullscreenSpaces)
+				if (SDL_strcmp(SDL_GetCurrentVideoDriver(), "x11") == 0)
 				{
 					if (wasFullscreen)
 					{
@@ -308,7 +297,7 @@ void KeyPoll::Poll(void)
 					music.pause();
 					music.pauseef();
 				}
-				if (!useFullscreenSpaces)
+				if (SDL_strcmp(SDL_GetCurrentVideoDriver(), "x11") == 0)
 				{
 					wasFullscreen = !graphics.screenbuffer->isWindowed;
 					graphics.screenbuffer->isWindowed = true;
diff --git a/desktop_version/src/KeyPoll.h b/desktop_version/src/KeyPoll.h
index b8851b46..1af5ed9c 100644
--- a/desktop_version/src/KeyPoll.h
+++ b/desktop_version/src/KeyPoll.h
@@ -72,7 +72,6 @@ private:
 	std::map<SDL_JoystickID, SDL_GameController*> controllers;
 	std::map<SDL_GameControllerButton, bool> buttonmap;
 	int xVel, yVel;
-	bool useFullscreenSpaces;
 	Uint32 wasFullscreen;
 };