Fix for nav focus