Fixed an issue with underlying the correct menu selected