adjust previous patch to align on top.

Also addresses https://bugzilla.gnome.org/show_bug.cgi?id=721622