[T7484] Fix leaves Menu and wizard target, tree view.

Merged Joel Maglioni requested to merge T7484 into 17.0-stage

Merge request reports