Merge pull request #1934 from Areloch/menubaracceleratorfix