diff --git a/client.c b/client.c
index 95d9d75..8971b35 100644
--- a/client.c
+++ b/client.c
@@ -435,6 +435,9 @@ client_ptrsave(struct client_ctx *cc)
 	if (client_inbound(cc, x, y)) {
 		cc->ptr.x = x;
 		cc->ptr.y = y;
+	} else {
+		cc->ptr.x = -1;
+		cc->ptr.y = -1;
 	}
 }
 
diff --git a/group.c b/group.c
index 1c2fd03..544207f 100644
--- a/group.c
+++ b/group.c
@@ -108,6 +108,11 @@ group_show(struct screen_ctx *sc, struct group_ctx *gc)
 	u_int			 i;
 	int			 lastempty = -1;
 
+	gc->highstack = 0;
+	TAILQ_FOREACH(cc, &gc->clients, group_entry) {
+		if (cc->stackingorder > gc->highstack)
+			gc->highstack = cc->stackingorder;
+	}
 	winlist = (Window *) xcalloc(sizeof(*winlist), (gc->highstack + 1));
 
 	/*