diff --git a/gfx/display_servers/dispserv_x11.c b/gfx/display_servers/dispserv_x11.c
index ce32bdcaeb..c7bf97d410 100644
--- a/gfx/display_servers/dispserv_x11.c
+++ b/gfx/display_servers/dispserv_x11.c
@@ -269,9 +269,6 @@ static bool x11_display_server_set_resolution(void *data,
             XRRSetCrtcConfig(dpy, res, res->crtcs[i], CurrentTime,
                   crtc->x, crtc->y, crtc->mode, crtc->rotation,
                   crtc->outputs, crtc->noutput);
-            XRRSetScreenSize(dpy, window, width, height,
-                  (int) ((25.4 * width) / 96.0),
-                  (int) ((25.4 * height) / 96.0));
             XSync(dpy, False);
 
             XRRFreeCrtcInfo(crtc);
@@ -305,9 +302,6 @@ static bool x11_display_server_set_resolution(void *data,
          XRRSetCrtcConfig(dpy, res, res->crtcs[monitor_index], CurrentTime,
                crtc->x, crtc->y, crtc->mode, crtc->rotation,
                crtc->outputs, crtc->noutput);
-         XRRSetScreenSize(dpy, window, width, height,
-                  (int) ((25.4 * width) / 96.0),
-                  (int) ((25.4 * height) / 96.0));
          XSync(dpy, False);
 
 
@@ -609,15 +603,15 @@ static void x11_display_server_destroy(void *data)
                   res->crtcs[x11_monitor_index],
                   CurrentTime, 0, 0, None, RR_Rotate_0, NULL, 0);
             XSync(dpy, False);
-            XRRSetScreenSize(dpy, window,
-                  crt_rrmode.width, crt_rrmode.height,
-                  (int) ((25.4 * crt_rrmode.width) / 96.0),
-                  (int) ((25.4 * crt_rrmode.height) / 96.0));
             XRRSetCrtcConfig(dpy, res,
                   res->crtcs[x11_monitor_index],
                   CurrentTime, crtc->x, crtc->y,
                   crtc->mode, crtc->rotation,
                   crtc->outputs, crtc->noutput);
+            XRRSetScreenSize(dpy, window,
+                  crt_rrmode.width, crt_rrmode.height,
+                  (int) ((25.4 * crt_rrmode.width) / 96.0),
+                  (int) ((25.4 * crt_rrmode.height) / 96.0));
             XSync(dpy, False);
 
             XRRFreeCrtcInfo(crtc);