Fix the menu entries which are sometimes not shown correctly