Java Development Tools

I am using the ADF Dialog Framework to open a dialog. Everything works fine as long as the user uses my close button rather than uses the browsers close button. I know that my ReturnListener does not fire when the x button is clicked.

I have tried to write javascript on the onunload event of the popup page that would call my close button so that my clean-up logic could occur but the action method for my close button only sometimes fires.

I was hoping maybe there is a cleaner way to know that the dialog has been closed...Can anyone help me??

Thanks in advance,
Wes