Short codes in MarketPress are messing up the Add to Cart button

I like to use shortcodes to add a little gallery of related products at the end of some product listings. They used to work fine, but now when someone adds an item to their art, it's adding the last item shown in the gallery instead of the listing they're on.

The most recent example is this listing for a Squeak the Mouse pattern. At the end of the listing I have this shortcode.

[mp_list_products paginate="true" page="1" per_page="6" order_by="rand" order="DESC" tag="dress-up-bunch"]

I'm attaching a screenshot of the end of the product listing.

When the customer is on the Squeak listing and hits Add to Cart, the Flower Fairy Wings are added instead.

For now I'm removing all the shortcode like this that I can find - but I liked the feature and would like to keep using it. Can you help?