Fix settings back button implementation
Merge pull request #4712 from JohnONolan/fix-backbutton