Issue #1847574 by stevector: Fixed Toolbar sets the active-trail to the last clicked menu item, not the current menu item.