The two had a huge fight Friday night while having dinner at Yamato in Encino, Calif.

Us Weekly reports, "They had just sat down and didn't order when they started to fight. Ten minutes later, they stormed out without speaking and she drove off in her car," a witness said, adding that Justin was "swearing and yelling" after Selena left.

However, last night was a much different scene. The pair were seen together at an AMA's after party at Hollywood hotspot Bootsy Bellows which was hosted by Justin's manger Scooter Braun.