diff --git a/src/x11_window.c b/src/x11_window.c
index 641b3c84..dd387e06 100644
--- a/src/x11_window.c
+++ b/src/x11_window.c
@@ -1512,6 +1512,12 @@ void _glfwPlatformSetWindowTitle(_GLFWwindow* window, const char* title)
     // Set window & icon title
     XStoreName(_glfwLibrary.X11.display, window->X11.handle, title);
     XSetIconName(_glfwLibrary.X11.display, window->X11.handle, title);
+    
+    XChangeProperty(_glfwLibrary.X11.display,  window->X11.handle,
+            XInternAtom(_glfwLibrary.X11.display, "_NET_WM_NAME", False),
+            XInternAtom(_glfwLibrary.X11.display, "UTF8_STRING", False),
+            8, PropModeReplace, (unsigned char *) title,
+            strlen(title));
 }