Need to restrict department access by legal entity in manage departments task

We have a requirement to restrict the department by legal entity in Workforce structure > Manage Departments.

We are currently able to achieve this restriction using organization tree. However, the issue is if a user who has legal entity wise restricted role and creates a new department, that new department is not visible to the user until the new department is not added in the Organization tree.

Organization tree structure - Legal entity > Business unit > Department

Is there any alternate way to achieve legal entity wise restriction for managing departments without having the need to use Organization / department tree. if not, then is there a way to avoid the step of adding new departments in the org tree every time any new department will be created?