Merge pull request #24163 from colemanw/menubarRefreshFix