Fixed toolbar not drawing in certain cases on load.