Comment 13 for bug 627361

I see Shevonar attached a branch related to this and a couple other menu-related bugs, but I haven't taken a look at it, and don't know whether it was ever proposed for merging to trunk. Not sure how far it got, but it's rather outdated now, so I don't know how much of it can be salvaged.