Yes, this is a bit annoying behavior. I hope they fix it one day. However, we've found a simpler way to rejoin the companion than dismissing him. Once your friend connects simply load the save again. Companions should be correctly attached to your heroes afterwards.
