1 files changed, 10 insertions, 0 deletions
diff --git a/kbfunc.c b/kbfunc.c
index ef8630e..cde37e3 100644
--- a/kbfunc.c
+++ b/kbfunc.c
@@ -451,6 +451,16 @@ kbfunc_client_cycle(void *ctx, struct cargs *cargs)
 		newcc->ptr.y = newcc->geom.h / 2;
 	}
 	client_ptr_warp(newcc);
+
+	/* When no client is active warp pointer to last active */
+	if (oldcc->flags & (CLIENT_ACTIVE))
+		client_ptr_warp(newcc);
+	else if (oldcc->flags & (CLIENT_SKIP_CYCLE))
+		client_ptr_warp(newcc);
+	else {
+		client_raise(oldcc);
+		client_ptr_warp(oldcc);
+	}
 }
 
 void