Fixed focus getting stuck in entity boundary