Going to a Custom Sub-page Pop-up windows does not close on hitting Save and Return