Fix issue with setting the current page immediately after a page is added

Change-Id: Ia9ddc42896b47b10bb98ed6bd6cece1b033207c1
2 files changed