Added selection for #78731

And improvements to edition toolbar tools enabling.