Fix #1941 - allow wrapping around in the list of programs
Merge pull request #1956 from AlbertJP/menu-key-wrap

[2.0] Fix #1941 - allow wrapping around in the list of programs, closes #1941