diff --git a/src/plugins/mcusupport/mcusupportoptionspage.cpp b/src/plugins/mcusupport/mcusupportoptionspage.cpp
index 06bb9a86e63..c0d1c42afc7 100644
--- a/src/plugins/mcusupport/mcusupportoptionspage.cpp
+++ b/src/plugins/mcusupport/mcusupportoptionspage.cpp
@@ -168,6 +168,9 @@ void McuSupportOptionsPage::apply()
     QTC_ASSERT(m_options->armGccPackage, return);
     QTC_ASSERT(m_options->qtForMCUsSdkPackage, return);
 
+    if (!widget()->isVisible())
+        return; // Only create/overwrite kits when this option page is shown
+
     const McuTarget *mcuTarget = m_widget->currentMcuTarget();
     if (!mcuTarget)
         return;