diff --git a/client.c b/client.c
index 208c101..6f27b27 100644
--- a/client.c
+++ b/client.c
@@ -100,7 +100,7 @@ client_init(Window win, struct screen_ctx *sc, int active)
 
 	if (wattr.map_state != IsViewable) {
 		client_placecalc(cc);
-		client_move(cc);
+		client_resize(cc, 0);
 		if ((cc->wmh) && (cc->wmh->flags & StateHint))
 			client_set_wm_state(cc, cc->wmh->initial_state);
 	} else {
diff --git a/group.c b/group.c
index b585286..722afcb 100644
--- a/group.c
+++ b/group.c
@@ -164,7 +164,7 @@ group_movetogroup(struct client_ctx *cc, int idx)
 
 	if (cc->gc == gc)
 		return;
-	if (group_holds_only_hidden(gc))
+	if (gc->num != 0 && group_holds_only_hidden(gc))
 		client_hide(cc);
 	group_assign(gc, cc);
 }