diff --git a/src/action/client.h b/src/action/client.h
index 1b3c9335..6984a394 100644
--- a/src/action/client.h
+++ b/src/action/client.h
@@ -48,6 +48,9 @@ static void finish_exchange_arrange_and_focus(Client *c1, Client *c2,
 	}
 	wl_list_remove(&c2->flink);
 	wl_list_insert(&c1->flink, &c2->flink);
+
+	if (config.warpcursor) 
+		warp_cursor(c1);
 }
 
 void client_tile_resize(Client *c, struct wlr_box geo, int32_t interact) {