[Misc] Better consistency between menus code in Flamingo.