Fix focus issue when option not selected