Merge pull request #1374 from cewert/make-back-work-on-user-select

Merge pull request #1374 from cewert/make-back-work-on-user-select #752