[#59725932] convert to non-popup per story