redirectOnClose Hotfix
Merge pull request #2462 from yakky/feature/hotfix_redirect_on_close

redirectOnClose Hotfix