[#59725932] convert to non-popup as per story