diff --git a/src/plugins/python/pythonrunconfiguration.cpp b/src/plugins/python/pythonrunconfiguration.cpp
index 47af192c931..fe8ede93b67 100644
--- a/src/plugins/python/pythonrunconfiguration.cpp
+++ b/src/plugins/python/pythonrunconfiguration.cpp
@@ -160,7 +160,7 @@ private:
 
 Interpreter InterpreterAspect::currentInterpreter() const
 {
-    return m_comboBox ? m_interpreters.value(m_comboBox->currentIndex()) : Interpreter();
+    return Utils::findOrDefault(m_interpreters, Utils::equal(&Interpreter::id, m_currentId));
 }
 
 void InterpreterAspect::updateInterpreters(const QList<Interpreter> &interpreters)