Fixing back button issue @SL-GuillermoJacquez

@SL-GuillerJacquez, please review my changes