diff --git a/desktop_version/src/KeyPoll.cpp b/desktop_version/src/KeyPoll.cpp
index 5c27c407..d70b46b3 100644
--- a/desktop_version/src/KeyPoll.cpp
+++ b/desktop_version/src/KeyPoll.cpp
@@ -1,4 +1,5 @@
 #include "KeyPoll.h"
+#include "Graphics.h"
 #include <stdio.h>
 #include <string.h>
 #include <utf8/unchecked.h>
@@ -248,7 +249,7 @@ void KeyPoll::Poll()
 				{
 					if (wasFullscreen)
 					{
-						gameScreen.isWindowed = false;
+						graphics.screenbuffer->isWindowed = false;
 						SDL_SetWindowFullscreen(
 							SDL_GetWindowFromID(evt.window.windowID),
 							SDL_WINDOW_FULLSCREEN_DESKTOP
@@ -262,8 +263,8 @@ void KeyPoll::Poll()
 				isActive = false;
 				if (!useFullscreenSpaces)
 				{
-					wasFullscreen = !gameScreen.isWindowed;
-					gameScreen.isWindowed = true;
+					wasFullscreen = !graphics.screenbuffer->isWindowed;
+					graphics.screenbuffer->isWindowed = true;
 					SDL_SetWindowFullscreen(
 						SDL_GetWindowFromID(evt.window.windowID),
 						0
diff --git a/desktop_version/src/Screen.h b/desktop_version/src/Screen.h
index b88ef528..0db5c3b2 100644
--- a/desktop_version/src/Screen.h
+++ b/desktop_version/src/Screen.h
@@ -33,6 +33,4 @@ public:
 	SDL_Rect filterSubrect;
 };
 
-extern Screen gameScreen;
-
 #endif /* SCREEN_H */