Prevented Add New submenu from highlighting wrong menu item