Fix aberrant popstate behavior part 2