Buttons in managers

[joew46167]

Fix for issue #9166 - set model to false before closing the dialog box so that focus returns properly.

All Submissions:

• Have you followed the guidelines in our Contributing document?
• Have you checked to ensure there aren't other open Pull Requests for the same update/change?

New Feature Submissions:

1. Does your submission pass tests?
2. Have you lint your code locally prior to submission?

Changes to Core Features:

• Have you added an explanation of what your changes do and why you'd like us to include them?
• Have you written new tests for your core changes, as applicable?
• Have you successfully ran tests with your changes

[joew46167]

I feel like maybe I should have used a new branch for this :(

Let me know if I need to close this PR and create a new one from a new branch.

[facchinm]

Don't worry, I'm cherry-picking the relevant commit and applying on the tree

[facchinm]

Merged as b9c3f00