Correctly handle extra menu items when single item selected