3601178 Add seperate handling for the modals.

Closes #3601178

Merge request reports

Loading