diff --git a/src/x11/window/mod.rs b/src/x11/window/mod.rs
index 9f600a8c..8f30373e 100644
--- a/src/x11/window/mod.rs
+++ b/src/x11/window/mod.rs
@@ -510,6 +510,16 @@ impl Window {
             }
         }
 
+        // Set ICCCM WM_CLASS property based on initial window title
+        unsafe {
+            with_c_str(&*builder.title, |c_name| {
+                let hint = ffi::XAllocClassHint();
+                (*hint).res_name = c_name as *mut i8;
+                (*hint).res_class = c_name as *mut i8;
+                ffi::XSetClassHint(display, window, hint);
+                ffi::XFree(hint as *mut libc::c_void);
+            });
+        }
 
         // creating GL context
         let (context, extra_functions) = unsafe {