PW-13549 - rework back button