menu: ensure button menu is visible when the main menu is auto hidden
* ensure view menu still works correctly

(integrated from trunk branch change fdeed72 by Todd Whiteman <toddw@activestate.com>)