diff --git a/manage.c b/manage.c
index 0586ee8..7fbf03d 100755
--- a/manage.c
+++ b/manage.c
@@ -16,6 +16,7 @@
 #include <X11/Xutil.h>
 #include <X11/Xatom.h>
 #include <X11/extensions/shape.h>
+#include "config.h"
 #include "dat.h"
 #include "fns.h"
 
@@ -178,8 +179,13 @@ manage(Client *c, int mapped)
 		XMapWindow(dpy, c->window);
 		XMapWindow(dpy, c->parent);
 		XUnmapWindow(dpy, c->screen->sweepwin);
-		if(nostalgia || doreshape)
+#ifdef AUTOSTICK
+		if(c->class && !isautostick(c))
 			active(c);
+#else
+    if(c->class)
+      active(c);
+#endif
 		else if(c->trans != None && current && current->window == c->trans)
 			active(c);
 		else