This fixes #7326.  There is now a dropdown menu with the required items.