Fixed the broken menu bar after the latest upstream updates