Make button-focus match Gtk2 more closely