Climate-smart agriculture (CSA) aims to achieve both mitigation and adaptation goals. So far CSA has been an exercise that is focused on agriculture technologies, with the underlying assumption that higher yields take pressure of forests. However, this cannot be taken for granted and deserves a closer look from science, policy and investment perspectives. If implemented in the right way, CSA has the potential for win-win outcomes. It also fits into the recent focus in climate debates on agriculture as a driver of deforestation and ecosystem degradation. That way, CSA can become an integral part of the solution to saving the world’s forests.