Focus fix to prevent page scrolling

Accessibility focus fix to prevent page jumping between tabbing.