Fix focus not working correctly when collection is a js/Array