Item13149: make it work with async page loads