fixes #2697
Merge pull request #2884 from digi604/fix-2697

fixes #2697 (out of order menu manipulations)