Make the "Return" window pop-up automatically upon death.

[Rhianu]

but what if you are waiting for revive?

Then you just don't press anything. Just because the window pops up, that doesn't mean you have to press any buttons in it.

And when someone finally does cast Revive on you, another window asking if you want to be revived will replace the current window.