Fix no scroll and constant open viewer bugs