diff --git a/src/wl_init.c b/src/wl_init.c
index e7e9000b..aaef1b69 100644
--- a/src/wl_init.c
+++ b/src/wl_init.c
@@ -501,12 +501,12 @@ static void keyboardHandleLeave(void* data,
     if (!window)
         return;
 
+    struct itimerspec timer = {};
+    timerfd_settime(_glfw.wl.timerfd, 0, &timer, NULL);
+
     _glfw.wl.serial = serial;
     _glfw.wl.keyboardFocus = NULL;
     _glfwInputWindowFocus(window, GLFW_FALSE);
-
-    struct itimerspec timer = {};
-    timerfd_settime(_glfw.wl.timerfd, 0, &timer, NULL);
 }
 
 static int toGLFWKeyCode(uint32_t key)
diff --git a/src/wl_window.c b/src/wl_window.c
index 6ee1a16d..56706f59 100644
--- a/src/wl_window.c
+++ b/src/wl_window.c
@@ -865,16 +865,13 @@ static void handleEvents(int timeout)
 
             if (read(_glfw.wl.timerfd, &repeats, sizeof(repeats)) == 8)
             {
-                if (_glfw.wl.keyboardFocus)
+                for (uint64_t i = 0; i < repeats; i++)
                 {
-                    for (uint64_t i = 0; i < repeats; i++)
-                    {
-                        _glfwInputKey(_glfw.wl.keyboardFocus,
-                                      _glfw.wl.keyboardLastKey,
-                                      _glfw.wl.keyboardLastScancode,
-                                      GLFW_REPEAT,
-                                      _glfw.wl.xkb.modifiers);
-                    }
+                    _glfwInputKey(_glfw.wl.keyboardFocus,
+                                  _glfw.wl.keyboardLastKey,
+                                  _glfw.wl.keyboardLastScancode,
+                                  GLFW_REPEAT,
+                                  _glfw.wl.xkb.modifiers);
                 }
             }
         }