fix: Resolve #3625010 "Error closing dialog"

andres alvarezrequested to merge
issue/flag-3625010:3625010-error-closing-dialog into 5.1.x

Related to #3625010

Merge request reports