Re #8909. Fixed the menu issue.