diff --git a/README.md b/README.md
index c6b19b76..3fc111ff 100644
--- a/README.md
+++ b/README.md
@@ -175,6 +175,7 @@ information on what to include when reporting a bug.
  - [X11] Bugfix: Any IM started after initialization would not be detected
  - [X11] Bugfix: Xlib errors caused by other parts of the application could be
    reported as GLFW errors
+ - [X11] Bugfix: A handle race condition could cause a `BadWindow` error (#1633)
  - [Wayland] Removed support for `wl_shell` (#1443)
  - [Wayland] Bugfix: The `GLFW_HAND_CURSOR` shape used the wrong image (#1432)
  - [Wayland] Bugfix: `CLOCK_MONOTONIC` was not correctly enabled
diff --git a/src/x11_window.c b/src/x11_window.c
index 7eda5b8b..d6e6bf37 100644
--- a/src/x11_window.c
+++ b/src/x11_window.c
@@ -1547,6 +1547,8 @@ static void processEvent(XEvent *event)
             //       the position into root (screen) coordinates
             if (!event->xany.send_event && window->x11.parent != _glfw.x11.root)
             {
+                _glfwGrabErrorHandlerX11();
+
                 Window dummy;
                 XTranslateCoordinates(_glfw.x11.display,
                                       window->x11.parent,
@@ -1554,6 +1556,10 @@ static void processEvent(XEvent *event)
                                       xpos, ypos,
                                       &xpos, &ypos,
                                       &dummy);
+
+                _glfwReleaseErrorHandlerX11();
+                if (_glfw.x11.errorCode == BadWindow)
+                    return;
             }
 
             if (xpos != window->x11.xpos || ypos != window->x11.ypos)