Fir for PLUS-1192:Container pop-up not getting close