Fix focus issue