This article reviews the history of thought on how intelligence and creativity, two individual differences important to teaching and learning, are connected. For decades, intelligence and creativity have been seen as essentially unrelated abilities. Recently, however, new theories, assessment methods, and statistical tools have caused a shift in the field's consensus. New lines of work on creative thinking strategies, executive cognitive processes and abilities, and cognitive neuroscience have revealed that intelligence and creativity are much more closely linked than the field has thought. The deep connections between these concepts offer opportunities for a more fertile conception of both intelligence and creativity, one that emphasizes similarities between solving problems with right answers and thinking flexibly, critically, and playfully.