diff --git a/gfx/video_display_server.c b/gfx/video_display_server.c
index 22f481ce45..c7e7dfd06d 100644
--- a/gfx/video_display_server.c
+++ b/gfx/video_display_server.c
@@ -29,16 +29,16 @@ void* video_display_server_init(void)
 
    switch (type)
    {
-#if defined(_WIN32) && !defined(_XBOX)
       case RARCH_DISPLAY_WIN32:
+#if defined(_WIN32) && !defined(_XBOX)
          current_display_server = &dispserv_win32;
-         break;
 #endif
-#if defined(HAVE_X11)
+         break;
       case RARCH_DISPLAY_X11:
+#if defined(HAVE_X11)
          current_display_server = &dispserv_x11;
-         break;
 #endif
+         break;
       default:
          current_display_server = &dispserv_null;
          break;