diff --git a/group.c b/group.c
index ea49862..744ca69 100644
--- a/group.c
+++ b/group.c
@@ -341,11 +341,6 @@ group_autogroup(struct client_ctx *cc)
 	struct group_ctx *gc;
 	char group[CALMWM_MAXNAMELEN];
 
-	if (Conf.flags & CONF_STICKY_GROUPS) {
-		_group_add(Group_active, cc);
-		return;
-	}
-
 	if (cc->app_class == NULL || cc->app_name == NULL)
 		return;
 
@@ -358,8 +353,13 @@ group_autogroup(struct client_ctx *cc)
 	}
 
 	TAILQ_FOREACH(gc, &Groupq, entry) {
-		if (strcmp(shortcut_to_name[gc->shortcut], group) == 0)
+		if (strcmp(shortcut_to_name[gc->shortcut], group) == 0) {
 			_group_add(gc, cc);
+			return;
+		}
 	}
 
+	if (Conf.flags & CONF_STICKY_GROUPS)
+		_group_add(Group_active, cc);
+
 }