diff --git a/src/window.c b/src/window.c
index ff43629e..36f2e25e 100644
--- a/src/window.c
+++ b/src/window.c
@@ -651,6 +651,9 @@ wManageWindow(WScreen *scr, Window window)
     XSetWindowBorderWidth(dpy, window, 0);
 
     /* get hints from GNUstep app */
+    if (wwin->wm_class != 0 && strcmp(wwin->wm_class, "GNUstep") == 0) {
+	wwin->flags.is_gnustep = 1;
+    }
     if (!PropGetGNUstepWMAttr(window, &wwin->wm_gnustep_attr)) {
 	wwin->wm_gnustep_attr = NULL;
     }