Fixed menu highlight bug