Fixes #20: Fix back button needed multiple presses