Base: Fix issue navigating back