I've already filed a joint return which I need to amend. Also, found out I need to file a Form 8379. What should I do?

Just trying to figure out what order I should do things.  Should I fill out the Form 8379 for the joint return then amend and file another Form 8379 for the amendment?