A bit better solution for toolbar scrolling.

The previous one affected a bit too many other components.