The Stage and Discard hunk buttons are not always visible

Just upgraded to 1.8.1.0 (according to the about box) and I've found the Diff view has regressed in usability, as the buttons for Staging and Discarding hunks are frequently off scrolled off screen. Pretty sure they were always on screen in the previous versions.

See attached image for an example of what I'm seeing.

I feel like the buttons to Stage and Discard hunks should always be visible, regardless of the whether the diff area has a horizontal scroll bar or not.