Fix for PLUS-1192: Container pop-up was not gettign closed on container add page