This article contributes to the debate about the future of just war thinking, which has been challenged by the emerging school of just peace. Just peace thinkers hope that by foregrounding nonviolent means just war reasoning will become obsolete. Recently, the German Catholic Bishops have argued that the traditional understanding of just war contributed to their predecessors' silence on the Second World War. Grounded in just peace thinking, their argument implies that had the new framework been in place at the time, it would have been easier for their predecessors to oppose Hitler's war. In this article, I defend traditional just war thinking as encountered in the thought of Thomas Aquinas. For Aquinas, just war thinking was part of an encompassing ethics of war and peace. In fact, peace was the primary goal. Grounded in Aquinas's understanding of virtue, I argue that there is a place for just peace scholarship within the just war framework. The tools of nonviolence should be seen as an important complement to the justifiable use of armed force.