Run away kites - what to do

I've seen various discussions on this in the past but having seen a few incidents of this just recently I'm wondering if those with experience can provide some guidance as to best practise when trying to help someone who has ditched / become detached from their kite - particularly how to safely recover their kite.

My recent experience - a fellow kiter was trying to help relaunch someone elses kite out on the water as they had under-inflated it and it would not relaunch on it's own. In the process his CL slipped off and the leash either ejected or failed and his kite got away from him. I was watching the scene unfold and he waved me down to retrieve his kite as he began swimming after it. I went down to the kite which was drifting swiftly downwind and dropped into the water next to the leading edge. All was fine as I held the kite but then his lines drifted down and suddenly found myself and my board all wrapped up. Immediately started wondering what would happen if either my kite (still flying) or his kite were to power up. Quickly started pulling the lines off me and trying not to get myself more caught up. As I managed to free myself the guy made it to his kite huffing and puffing after a heavy swim. I towed him in and all was ok but it left me wondering.

So what is the right way to retrieve someones kite out on the water without putting yourself in danger? Or is it simply always the case that you are taking a certain level of risk in kiting after someone's run away kite?

cool thanks! sorry to repost the same topic.