Fix flash of double scrollbar on modal #787