diff --git a/src/plugins/mcusupport/mcukitmanager.cpp b/src/plugins/mcusupport/mcukitmanager.cpp
index 898783fd737..c856c19e5d3 100644
--- a/src/plugins/mcusupport/mcukitmanager.cpp
+++ b/src/plugins/mcusupport/mcukitmanager.cpp
@@ -452,7 +452,7 @@ void createAutomaticKits(const SettingsHandler::Ptr &settingsHandler)
     McuPackagePtr qtForMCUsPackage{Sdk::createQtForMCUsPackage(settingsHandler)};
 
     const auto createKits = [qtForMCUsPackage, settingsHandler]() {
-        if (McuSupportOptions::automaticKitCreationFromSettings()) {
+        if (settingsHandler->isAutomaticKitCreationEnabled()) {
             qtForMCUsPackage->updateStatus();
             if (!qtForMCUsPackage->isValidStatus()) {
                 switch (qtForMCUsPackage->status()) {
diff --git a/src/plugins/mcusupport/mcusupportoptions.cpp b/src/plugins/mcusupport/mcusupportoptions.cpp
index d26e1b3d53a..647f441aefa 100644
--- a/src/plugins/mcusupport/mcusupportoptions.cpp
+++ b/src/plugins/mcusupport/mcusupportoptions.cpp
@@ -51,12 +51,6 @@ using namespace Utils;
 
 namespace McuSupport::Internal {
 
-namespace {
-const QString automaticKitCreationSettingsKey = QLatin1String(Constants::SETTINGS_GROUP) + '/'
-                                                + QLatin1String(
-                                                    Constants::SETTINGS_KEY_AUTOMATIC_KIT_CREATION);
-}
-
 McuSupportOptions::McuSupportOptions(const SettingsHandler::Ptr &settingsHandler, QObject *parent)
     : QObject(parent)
     , qtForMCUsSdkPackage(Sdk::createQtForMCUsPackage(settingsHandler))
@@ -66,7 +60,7 @@ McuSupportOptions::McuSupportOptions(const SettingsHandler::Ptr &settingsHandler
             &McuAbstractPackage::changed,
             this,
             &McuSupportOptions::populatePackagesAndTargets);
-    m_automaticKitCreation = automaticKitCreationFromSettings();
+    m_automaticKitCreation = settingsHandler->isAutomaticKitCreationEnabled();
 }
 
 void McuSupportOptions::populatePackagesAndTargets()
@@ -197,17 +191,4 @@ void McuSupportOptions::setAutomaticKitCreationEnabled(const bool enabled)
     m_automaticKitCreation = enabled;
 }
 
-void McuSupportOptions::writeGeneralSettings() const
-{
-    QSettings *settings = Core::ICore::settings(QSettings::UserScope);
-    settings->setValue(automaticKitCreationSettingsKey, m_automaticKitCreation);
-}
-
-bool McuSupportOptions::automaticKitCreationFromSettings()
-{
-    QSettings *settings = Core::ICore::settings(QSettings::UserScope);
-    const bool automaticKitCreation = settings->value(automaticKitCreationSettingsKey, true).toBool();
-    return automaticKitCreation;
-}
-
 } // namespace McuSupport::Internal
diff --git a/src/plugins/mcusupport/mcusupportoptions.h b/src/plugins/mcusupport/mcusupportoptions.h
index 740c7612ca9..0900fc3e0aa 100644
--- a/src/plugins/mcusupport/mcusupportoptions.h
+++ b/src/plugins/mcusupport/mcusupportoptions.h
@@ -87,8 +87,6 @@ public:
 
     bool automaticKitCreationEnabled() const;
     void setAutomaticKitCreationEnabled(const bool enabled);
-    void writeGeneralSettings() const;
-    static bool automaticKitCreationFromSettings();
 
 private:
     SettingsHandler::Ptr settingsHandler;
diff --git a/src/plugins/mcusupport/mcusupportoptionspage.cpp b/src/plugins/mcusupport/mcusupportoptionspage.cpp
index 20fd7e78deb..386de01d286 100644
--- a/src/plugins/mcusupport/mcusupportoptionspage.cpp
+++ b/src/plugins/mcusupport/mcusupportoptionspage.cpp
@@ -309,7 +309,7 @@ void McuSupportOptionsWidget::apply()
 {
     bool pathsChanged = false;
 
-    m_options.writeGeneralSettings();
+    m_settingsHandler->setAutomaticKitCreation(m_options.automaticKitCreationEnabled());
     pathsChanged |= m_options.qtForMCUsSdkPackage->writeToSettings();
     for (auto package : qAsConst(m_options.sdkRepository.packages))
         pathsChanged |= package->writeToSettings();
diff --git a/src/plugins/mcusupport/mcusupportsdk.h b/src/plugins/mcusupport/mcusupportsdk.h
index 3bf8380de9c..6d1feddf7ac 100644
--- a/src/plugins/mcusupport/mcusupportsdk.h
+++ b/src/plugins/mcusupport/mcusupportsdk.h
@@ -30,8 +30,6 @@
 
 #include <utils/filepath.h>
 
-#include <QSettings>
-
 namespace Utils {
 class FilePath;
 } // namespace Utils
diff --git a/src/plugins/mcusupport/settingshandler.cpp b/src/plugins/mcusupport/settingshandler.cpp
index be5dda97d4f..4b2188150d6 100644
--- a/src/plugins/mcusupport/settingshandler.cpp
+++ b/src/plugins/mcusupport/settingshandler.cpp
@@ -35,6 +35,12 @@ namespace McuSupport::Internal {
 
 using Utils::FilePath;
 
+namespace {
+const QString automaticKitCreationSettingsKey = QLatin1String(Constants::SETTINGS_GROUP) + '/'
+                                                + QLatin1String(
+                                                    Constants::SETTINGS_KEY_AUTOMATIC_KIT_CREATION);
+}
+
 static FilePath packagePathFromSettings(const QString &settingsKey,
                                         QSettings &settings,
                                         const FilePath &defaultPath)
@@ -67,4 +73,18 @@ bool SettingsHandler::write(const QString &settingsKey,
 
     return savedPath != path;
 }
+
+bool SettingsHandler::isAutomaticKitCreationEnabled() const
+{
+    QSettings *settings = Core::ICore::settings(QSettings::UserScope);
+    const bool automaticKitCreation = settings->value(automaticKitCreationSettingsKey, true).toBool();
+    return automaticKitCreation;
+}
+
+void SettingsHandler::setAutomaticKitCreation(bool isEnabled)
+{
+    QSettings *settings = Core::ICore::settings(QSettings::UserScope);
+    settings->setValue(automaticKitCreationSettingsKey, isEnabled);
+}
+
 } // namespace McuSupport::Internal
diff --git a/src/plugins/mcusupport/settingshandler.h b/src/plugins/mcusupport/settingshandler.h
index f88db3929d8..495716352ec 100644
--- a/src/plugins/mcusupport/settingshandler.h
+++ b/src/plugins/mcusupport/settingshandler.h
@@ -46,5 +46,8 @@ public:
     virtual bool write(const QString &settingsKey,
                        const Utils::FilePath &path,
                        const Utils::FilePath &defaultPath) const;
+
+    virtual bool isAutomaticKitCreationEnabled() const;
+    void setAutomaticKitCreation(bool isEnabled);
 }; //class SettingsHandler
 } // namespace McuSupport::Internal