Fix focus frame handling