diff --git a/Source/x11/XGServerWindow.m b/Source/x11/XGServerWindow.m
index 1add4321..686d1421 100644
--- a/Source/x11/XGServerWindow.m
+++ b/Source/x11/XGServerWindow.m
@@ -1939,10 +1939,11 @@ - (int) window: (NSRect)frame : (NSBackingStoreType)type : (unsigned int)style
 				&window->xwn_attrs);
 
   /*
-   * Mark this as a GNUstep app with the current application name.
+   * Mark the window as the application with name & class so the WM can group it
    */
+  const char *procName = [[[NSProcessInfo processInfo] processName] UTF8String];
   classhint.res_name = generic.rootName;
-  classhint.res_class = "GNUstep";
+  classhint.res_class = (char *)procName;
   XSetClassHint(dpy, window->ident, &classhint);
 
   window->map_state = IsUnmapped;