diff --git a/xevents.c b/xevents.c
index 91da64a..32b2262 100644
--- a/xevents.c
+++ b/xevents.c
@@ -340,7 +340,7 @@ static void
 xev_handle_clientmessage(XEvent *ee)
 {
 	XClientMessageEvent	*e = &ee->xclient;
-	struct client_ctx	*cc;
+	struct client_ctx	*cc, *old_cc;
 
 	if ((cc = client_find(e->window)) == NULL)
 		return;
@@ -351,6 +351,14 @@ xev_handle_clientmessage(XEvent *ee)
 
 	if (e->message_type == ewmh[_NET_CLOSE_WINDOW].atom)
 		client_send_delete(cc);
+
+	if (e->message_type == ewmh[_NET_ACTIVE_WINDOW].atom &&
+	    e->format == 32) {                                                
+		old_cc = client_current();
+		if (old_cc)
+			client_ptrsave(old_cc);
+		client_ptrwarp(cc);
+	}                              
 }
 
 static void