diff --git a/src/swiftlauncher/swiftlauncher.cpp b/src/swiftlauncher/swiftlauncher.cpp
index 72e861918..bd8867b6d 100644
--- a/src/swiftlauncher/swiftlauncher.cpp
+++ b/src/swiftlauncher/swiftlauncher.cpp
@@ -57,7 +57,13 @@ CSwiftLauncher::CSwiftLauncher(QWidget *parent) :
     connect(ui->tb_BackToMain, &QToolButton::pressed, this, &CSwiftLauncher::showMainPage);
     connect(ui->tb_ConfigurationWizard, &QToolButton::pressed, this, &CSwiftLauncher::startWizard);
     connect(ui->tb_Launcher, &QToolBox::currentChanged, this, &CSwiftLauncher::tabChanged);
+
+    connect(ui->rb_SwiftCoreAudioOnCore, &QRadioButton::released, this, &CSwiftLauncher::onCoreModeReleased);
+    connect(ui->rb_SwiftCoreAudioOnGui, &QRadioButton::released, this, &CSwiftLauncher::onCoreModeReleased);
+    connect(ui->rb_SwiftStandalone, &QRadioButton::released, this, &CSwiftLauncher::onCoreModeReleased);
+
     connect(ui->comp_DistributionInfo, &CDistributionInfoComponent::distributionInfoAvailable, this, &CSwiftLauncher::distributionInfoAvailable);
+    connect(ui->comp_DBusSelector, &CDBusServerAddressSelector::editingFinished, this, &CSwiftLauncher::onDBusEditingFinished);
     connect(sGui, &CGuiApplication::styleSheetsChanged, this, &CSwiftLauncher::onStyleSheetsChanged);
 
     new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_L), this, SLOT(showLogPage()));
@@ -461,3 +467,13 @@ void CSwiftLauncher::onStyleSheetsChanged()
 {
     this->initStyleSheet();
 }
+
+void CSwiftLauncher::onDBusEditingFinished()
+{
+    ui->rb_SwiftCoreAudioOnGui->setChecked(true);
+}
+
+void CSwiftLauncher::onCoreModeReleased()
+{
+    ui->comp_DBusSelector->setEnabled(!ui->rb_SwiftStandalone->isChecked());
+}
diff --git a/src/swiftlauncher/swiftlauncher.h b/src/swiftlauncher/swiftlauncher.h
index 5ce470bac..4ad288b8e 100644
--- a/src/swiftlauncher/swiftlauncher.h
+++ b/src/swiftlauncher/swiftlauncher.h
@@ -178,6 +178,12 @@ private:
     //! Style sheet has been changed
     void onStyleSheetsChanged();
 
+    //! DBus editing completed
+    void onDBusEditingFinished();
+
+    //! Core mode has been changed
+    void onCoreModeReleased();
+
     //! Command line
     static QString toCmdLine(const QString &exe, const QStringList &exeArgs);
 };