Issue #3528843 by zeshan.ziya, renatog, gbmapo, shubham_pareek_19: Right button closes two modals on the row