diff --git a/README.md b/README.md
index 9ba95d99a..85c78327a 100644
--- a/README.md
+++ b/README.md
@@ -120,6 +120,7 @@ information on what to include when reporting a bug.
 - [Win32] Bugfix: Undecorated windows could not be iconified by the user (#861)
 - [Win32] Bugfix: Deadzone logic could underflow with some controllers (#910)
 - [X11] Replaced `_GLFW_HAS_XF86VM` compile-time option with dynamic loading
+- [X11] Bugfix: X11: send timestamp of last key press to NET\_ACTIVE\_WINDOW
 - [Cocoa] Added support for Vulkan window surface creation via MoltenVK (#870)
 - [Cocoa] Bugfix: Disabling window aspect ratio would assert (#852)
 - [Cocoa] Bugfix: Window creation failed to set first responder (#876,#883)
@@ -277,6 +278,7 @@ skills.
  - Santi Zupancic
  - Jonas Ådahl
  - Lasse Öörni
+ - Tobias Markus
  - All the unmentioned and anonymous contributors in the GLFW community, for bug
    reports, patches, feedback, testing and encouragement
 
diff --git a/src/x11_window.c b/src/x11_window.c
index db34e9d9a..723778fb8 100644
--- a/src/x11_window.c
+++ b/src/x11_window.c
@@ -1945,7 +1945,8 @@ void _glfwPlatformHideWindow(_GLFWwindow* window)
 void _glfwPlatformFocusWindow(_GLFWwindow* window)
 {
     if (_glfw.x11.NET_ACTIVE_WINDOW)
-        sendEventToWM(window, _glfw.x11.NET_ACTIVE_WINDOW, 1, 0, 0, 0, 0);
+        sendEventToWM(window, _glfw.x11.NET_ACTIVE_WINDOW,
+                      1, window->x11.lastKeyTime, 0, 0, 0);
     else
     {
         XRaiseWindow(_glfw.x11.display, window->x11.handle);