Fix for the tabindex issue