Resolve "Add extra functionality for the top right Plus Button"

Closes #23603

See merge request !11632