Trump is gonna Trump.
I’ve learned to at least try to ignore those times, where he seems to be walking around, looking for somebody to have a scuffle with. I just wait him out, till he refocuses on the issues. It may take a few weeks. Most times, his compulsion to confront and battle is a feature, not a bug.
I love Trump precisely because he's gonna Trump. 7+ years later it's still so refreshing. I would take Trump any day over a scripted boring politician who says all the right things.