Fixing tab focus issue