Partially fix back button on list -> Map action