diff --git a/src/wl_platform.h b/src/wl_platform.h
index b3d23da0..b85d79a5 100644
--- a/src/wl_platform.h
+++ b/src/wl_platform.h
@@ -276,7 +276,7 @@ typedef struct _GLFWwindowWayland
     struct {
         struct wl_buffer*                  buffer;
         _GLFWdecorationWayland             top, left, right, bottom;
-        int                                focus;
+        _GLFWdecorationSideWayland         focus;
     } decorations;
 } _GLFWwindowWayland;
 
diff --git a/src/wl_window.c b/src/wl_window.c
index 300dc571..bf646a21 100644
--- a/src/wl_window.c
+++ b/src/wl_window.c
@@ -976,9 +976,9 @@ static char* readDataOfferAsString(struct wl_data_offer* offer, const char* mime
 }
 
 static _GLFWwindow* findWindowFromDecorationSurface(struct wl_surface* surface,
-                                                    int* which)
+                                                    _GLFWdecorationSideWayland* which)
 {
-    int focus;
+    _GLFWdecorationSideWayland focus;
     _GLFWwindow* window = _glfw.windowListHead;
     if (!which)
         which = &focus;
@@ -1020,7 +1020,7 @@ static void pointerHandleEnter(void* userData,
     if (!surface)
         return;
 
-    int focus = 0;
+    _GLFWdecorationSideWayland focus = mainWindow;
     _GLFWwindow* window = wl_surface_get_user_data(surface);
     if (!window)
     {