Sync with upstream / whitespace cleanup
Cycle through the menu once we reach the begin/end