He took center stage in the encore.
Goldschmidt hit the first pitch of the 11th inning for a game-ending home run after leading off the ninth with a tying homer, helping the Arizona Diamondbacks beat Baltimore 4-3 on Tuesday night for their second straight walk-off victory over the Orioles.
"I had a good viewing point yesterday to see Eaton, but it's fun either way," Goldschmidt said after his third career walk-off homer.
Goldschmidt was due up second in the ninth inning of a back-and-forth, 7-6 win over Baltimore in the opener Monday night and was one of the first to congratulate Eaton as he crossed the plate.
Goldschmidt one-upped his teammate with two dramatic homers to give Arizona its 25th win in its last at-bat.
The first came in the ninth, when he led off with a drive against Jim Johnson, the major leagues' saves leader.
Goldschmidt's next at-bat came in the 11th, and he wasted no time, lifting the first pitch by T.J. McFarland (1-1) just over the wall in right for his 29th homer and second walk-off of the homestand.
It was Arizona's ninth walk-off and 34th comeback victory.
"Goldy, at the end of a game, it's pretty special what he can do," Diamondbacks manager Kirk Gibson said. "He's a good guy to have on your side."
J.J. Hardy also homered for the Orioles, but their bullpen failed for the second straight night.
"They (the losses) were tough, but you know, we move on," Orioles manager Buck Showalter said.
Gonzalez retired the first 11 batters he faced and had the Diamondbacks off-balance by mixing his low-90s fastball and big curveball.
Gonzalez blew a 3-0 lead in his last start and got into trouble again, this time in the seventh inning.
Gonzalez allowed two runs and five hits.
Francisco Rodriguez did his part with a perfect eighth, but Johnson blew his AL-leading eighth save when Goldschmidt lined a 3-1 pitch over the wall in left-center. It was Goldschmidt's fifth homer in the ninth inning, most in the majors.
Goldschmidt ended it in dramatic fashion, squeezing a drive just over the wall for his fourth career game-ending hit before being mobbed by teammates at the plate. Goldschmidt hit a walk-off homer against the Mets on Friday.
"Looking at what the guys have been putting into the game and the way the game unfolded, it was heartbreaking, but we have to forget about it," Johnson said.
Arizona starter Randall Delgado was sharp for the most part, his only problem was giving up the long ball.
Davis hit the first one, a two-run shot in the fourth inning. Hardy led off the fifth with his 22nd homer to extend his hitting streak to 10 games and put the Orioles up 3-0.
Delgado was good after that, though, allowing three runs and five hits before being lifted for a pinch hitter in the seventh inning.
"Delgado gave up those runs early, we were behind, there was no momentum," Goldschmidt said. "For him to keep putting up zeroes and the bullpen pitching scoreless innings, it gives the offense a chance to come back."
And they did behind Goldschmidt, who was greeted with a chant of "MVP!" before being mobbed after his latest heroics.
Davis leads the majors with 43 extra-base hits on the road. ... Arizona has played 16 extra-inning games this season, tied for second-most (2003) in team history. ... Arizona LHP Patrick Corbin, an NL All-Star, is 0-2 with a 2.70 ERA in his last three starts. He will start Wednesday's series finale. ... RHP Chris Tillman, who will start Wednesday against Arizona, is 7-1 with a 2.97 ERA in 10 road starts this season.