Fix tab focus more gracefully