Better preserve device back button history