Correct #1634
Menu is now scrollable