ENYO-3042: popup reset improvement