ARW-620 fix popstate issue on chrome/safari