#3521923 modify popup logic

Closes #3521923

Merge request reports

Loading