Base: Fix transition to same page issues