Patch up the back button support to properly handle action