diff --git a/Source/x11/XGServerWindow.m b/Source/x11/XGServerWindow.m
index e16f7775..075d5d01 100644
--- a/Source/x11/XGServerWindow.m
+++ b/Source/x11/XGServerWindow.m
@@ -1,3 +1,4 @@
+
 /* XGServerWindows - methods for window/screen handling
 
    Copyright (C) 1999-2020 Free Software Foundation, Inc.
@@ -1933,10 +1934,10 @@ - (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
    */
   classhint.res_name = generic.rootName;
-  classhint.res_class = "GNUstep";
+  classhint.res_class = generic.rootName;
   XSetClassHint(dpy, window->ident, &classhint);
 
   window->map_state = IsUnmapped;