diff --git a/README.md b/README.md
index a5689a5c..29bd91f7 100644
--- a/README.md
+++ b/README.md
@@ -155,6 +155,7 @@ information on what to include when reporting a bug.
    less than 1 (#2754)
  - [X11] Bugfix: Clamp width and height to >= 1 to prevent BadValue error and app exit
  - [X11] Bugfix: Floating windows silently became non-floating when hidden (#2276)
+ - [X11] Bugfix: The `libXext` library was not unloaded at termination
  - [Linux] Bugfix: The header for `ioctl` was only implicitly included (#2778)
  - [Null] Added Vulkan 'window' surface creation via `VK_EXT_headless_surface`
  - [Null] Added EGL context creation on Mesa via `EGL_MESA_platform_surfaceless`
diff --git a/src/x11_init.c b/src/x11_init.c
index 6b34c263..5f760f43 100644
--- a/src/x11_init.c
+++ b/src/x11_init.c
@@ -1622,6 +1622,12 @@ void _glfwTerminateX11(void)
         _glfw.x11.xrender.handle = NULL;
     }
 
+    if (_glfw.x11.xshape.handle)
+    {
+        _glfwPlatformFreeModule(_glfw.x11.xshape.handle);
+        _glfw.x11.xshape.handle = NULL;
+    }
+
     if (_glfw.x11.vidmode.handle)
     {
         _glfwPlatformFreeModule(_glfw.x11.vidmode.handle);