diff --git a/src/wl_window.c b/src/wl_window.c
index 8aa7b99f..fd729ff0 100644
--- a/src/wl_window.c
+++ b/src/wl_window.c
@@ -238,15 +238,15 @@ int _glfwPlatformCreateWindow(_GLFWwindow* window,
                               const _GLFWctxconfig* ctxconfig,
                               const _GLFWfbconfig* fbconfig)
 {
+    if (!createSurface(window, wndconfig))
+        return GLFW_FALSE;
+
     if (ctxconfig->api != GLFW_NO_API)
     {
         if (!_glfwCreateContext(window, ctxconfig, fbconfig))
             return GLFW_FALSE;
     }
 
-    if (!createSurface(window, wndconfig))
-        return GLFW_FALSE;
-
     if (wndconfig->monitor)
     {
         wl_shell_surface_set_fullscreen(