Improve Menubar ItemStateSelect logic