Fixes #81018

And a minor improvement to the feature editor tool deactivation.