Kris Jenner and Caitlyn Jenner had a reunion at the recent Victoria’s Secret Fashion Show, which their daughter Kendall walked in, and Kris reportedly walked right up to her ex and gave her a big hug.

Things haven’t always been so easy between them; when Caitlyn first made her transition public, she and Kris had a hard time working out their feelings. Having been broken up for some time, there was still some resentment from both parties that went unresolved until they had a sit-down, which was captured on camera after Caitlyn’s interview with Vanity Fair was released.

“I think in a lot of ways she became less tolerant of me. Then I’d get upset, and the whole relationship kind of fizzled…20 percent gender and 80 percent was the way I was treated,” Caitlyn said of her time with Kris, when she identified as Bruce.

Kris became very upset after reading the article, which was caught on camera for Keeping Up With The Kardashians.

“He can go f**k himself! I honestly wish I never met this man. I mean, just f**k you, Bruce,” Kris said.

However, it appears the duo have now put it all behind them, as they reportedly reunited with no drama in order to support their daughter at the fashion show.

“Caitlin walked in and went straight over to Kris. They talked for ten minutes,” a source told Us Weekly.

Kris Jenner made headlines before the show, as well, when she dropped by NYC eatery Serendipity with boyfriend Corey Gamble and shared some PDA.

“They came for the Frrrozen Hot Chocolate. They ordered one and shared it. Corey loved it. Kris was feeding him spoonfuls. It was very sweet. The whole family loves it,” a source told E! News of the treats.