Handle focus issues