[BUG #7153] Minor fix.
[BUG #7009] Make sure to not close the menu if the scrolling is on a menu.