WIP Fix back button behavior #13

Closed
raucao wants to merge 1 commits from bugfix/back_button into master
pull from: bugfix/back_button