diff --git a/platform/x11/os_x11.cpp b/platform/x11/os_x11.cpp
index e5ca70fbedc..4bb4816723d 100644
--- a/platform/x11/os_x11.cpp
+++ b/platform/x11/os_x11.cpp
@@ -192,9 +192,10 @@ void OS_X11::initialize(const VideoMode& p_desired,int p_video_driver,int p_audi
 		xsh = XAllocSizeHints();
 		xsh->flags = PMinSize | PMaxSize;
 		XWindowAttributes xwa;
-		XGetWindowAttributes(x11_display,x11_window,&xwa);
 		if (current_videomode.fullscreen) {
-			XGetWindowAttributes(x11_display,xwa.root,&xwa);
+			XGetWindowAttributes(x11_display,DefaultRootWindow(x11_display),&xwa);
+		} else {
+			XGetWindowAttributes(x11_display,x11_window,&xwa);
 		}
 		xsh->min_width = xwa.width; 
 		xsh->max_width = xwa.width;
diff --git a/platform/x11/os_x11.h b/platform/x11/os_x11.h
index e1cd5ddd9dc..dd7278e76da 100644
--- a/platform/x11/os_x11.h
+++ b/platform/x11/os_x11.h
@@ -49,16 +49,6 @@
 #include <X11/Xlib.h>
 #include <X11/Xcursor/Xcursor.h>
 
-// Hints for X11 fullscreen
-typedef struct {
-	unsigned long flags;
-	unsigned long functions;
-	unsigned long decorations;
-	long inputMode;
-	unsigned long status;
-} Hints;
-
-//bitch
 #undef CursorShape
 /**
 	@author Juan Linietsky <reduzio@gmail.com>