diff --git a/src/plugins/projectexplorer/kitinformationconfigwidget.cpp b/src/plugins/projectexplorer/kitinformationconfigwidget.cpp
index 9945c31b1883d2ea5a071ec4104ea1ae9bd2e7fd..5ee3f6483b973d0391e6eb41807f783c49365332 100644
--- a/src/plugins/projectexplorer/kitinformationconfigwidget.cpp
+++ b/src/plugins/projectexplorer/kitinformationconfigwidget.cpp
@@ -346,15 +346,19 @@ void DeviceInformationConfigWidget::manageDevices()
 void DeviceInformationConfigWidget::modelAboutToReset()
 {
     m_selectedId = m_model->deviceId(m_comboBox->currentIndex());
+    m_ignoreChange = true;
 }
 
 void DeviceInformationConfigWidget::modelReset()
 {
     m_comboBox->setCurrentIndex(m_model->indexForId(m_selectedId));
+    m_ignoreChange = false;
 }
 
 void DeviceInformationConfigWidget::currentDeviceChanged()
 {
+    if (m_ignoreChange)
+        return;
     DeviceKitInformation::setDeviceId(m_kit, m_model->deviceId(m_comboBox->currentIndex()));
 }
 
diff --git a/src/plugins/projectexplorer/kitinformationconfigwidget.h b/src/plugins/projectexplorer/kitinformationconfigwidget.h
index 0b8ea8696a67d8232a13879b4b9d8bf8df89b1fc..3838c3aede9d31764623f73c3db9e0fcde7a5ece 100644
--- a/src/plugins/projectexplorer/kitinformationconfigwidget.h
+++ b/src/plugins/projectexplorer/kitinformationconfigwidget.h
@@ -159,6 +159,7 @@ private slots:
 
 private:
     bool m_isReadOnly;
+    bool m_ignoreChange;
     QComboBox *m_comboBox;
     QPushButton *m_manageButton;
     DeviceManagerModel *m_model;