Remove HACK with setting menuItem