Make tabbing in the navigation work more reliably.