Fix MenuBar behavior