Mac convert, day 3.5

Forgot one more annoyance. When I login to a remote machine using ssh with X forwarding, and I run some X program (e.g. diff or merge tools) from the shell. Then, the focus moves to the newly popped up X program (which is good). But when I'm done with that program and quit it, the focus doesn't return to my terminal. Instead, X application, without any application window, stays and eats my keys. Is there any way not to have this stupid behavior ?