Fix focus bug