Fixed text focus issues