diff --git a/src/plugins/simulator/xplaneconfig/simulatorxplaneconfigwindow.cpp b/src/plugins/simulator/xplaneconfig/simulatorxplaneconfigwindow.cpp
index 6ea70b203..186f6397d 100644
--- a/src/plugins/simulator/xplaneconfig/simulatorxplaneconfigwindow.cpp
+++ b/src/plugins/simulator/xplaneconfig/simulatorxplaneconfigwindow.cpp
@@ -27,11 +27,24 @@ namespace BlackSimPlugin
         {
             ui->setupUi(this);
 
-            connect(ui->bb_OkCancel, &QDialogButtonBox::accepted, this, &CSimulatorXPlaneConfigWindow::close);
+            ui->comp_SettingsXSwiftBus->set(m_xswiftbusServerSetting.getThreadLocal());
+
+            connect(ui->bb_OkCancel, &QDialogButtonBox::accepted, this, &CSimulatorXPlaneConfigWindow::settingsAccepted);
             connect(ui->bb_OkCancel, &QDialogButtonBox::rejected, this, &CSimulatorXPlaneConfigWindow::close);
         }
 
         CSimulatorXPlaneConfigWindow::~CSimulatorXPlaneConfigWindow()
         { }
+
+        void CSimulatorXPlaneConfigWindow::settingsAccepted()
+        {
+            QString currentAddress = m_xswiftbusServerSetting.getThreadLocal();
+            if (currentAddress != ui->comp_SettingsXSwiftBus->getDBusAddress())
+            {
+                m_xswiftbusServerSetting.set(ui->comp_SettingsXSwiftBus->getDBusAddress());
+            }
+            close();
+        }
+
     } // ns
 } // ns
diff --git a/src/plugins/simulator/xplaneconfig/simulatorxplaneconfigwindow.h b/src/plugins/simulator/xplaneconfig/simulatorxplaneconfigwindow.h
index b733d3e94..6ff97a493 100644
--- a/src/plugins/simulator/xplaneconfig/simulatorxplaneconfigwindow.h
+++ b/src/plugins/simulator/xplaneconfig/simulatorxplaneconfigwindow.h
@@ -13,6 +13,7 @@
 #define BLACKSIMPLUGIN_SIMULATOR_XPLANE_CONFIG_WINDOW_H
 
 #include "blackgui/pluginconfigwindow.h"
+#include "blackmisc/simulation/settings/xswiftbussettings.h"
 #include "simulatorxplaneconfig.h"
 #include <QObject>
 #include <QScopedPointer>
@@ -39,7 +40,10 @@ namespace BlackSimPlugin
             virtual ~CSimulatorXPlaneConfigWindow();
 
         private:
+            void settingsAccepted();
+
             QScopedPointer<Ui::CSimulatorXPlaneConfigWindow> ui;
+            BlackMisc::CSetting<BlackMisc::Simulation::Settings::TXSwiftBusServer> m_xswiftbusServerSetting { this };
         };
     } // ns
 } // ns
diff --git a/src/plugins/simulator/xplaneconfig/simulatorxplaneconfigwindow.ui b/src/plugins/simulator/xplaneconfig/simulatorxplaneconfigwindow.ui
index 03d2935c9..41a6879eb 100644
--- a/src/plugins/simulator/xplaneconfig/simulatorxplaneconfigwindow.ui
+++ b/src/plugins/simulator/xplaneconfig/simulatorxplaneconfigwindow.ui
@@ -6,14 +6,29 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>184</width>
-    <height>66</height>
+    <width>273</width>
+    <height>191</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>X-Plane plugin settings</string>
   </property>
   <layout class="QGridLayout" name="gl_ConfigWindow">
+   <property name="leftMargin">
+    <number>5</number>
+   </property>
+   <property name="topMargin">
+    <number>5</number>
+   </property>
+   <property name="rightMargin">
+    <number>5</number>
+   </property>
+   <property name="bottomMargin">
+    <number>5</number>
+   </property>
+   <property name="horizontalSpacing">
+    <number>2</number>
+   </property>
    <item row="1" column="0">
     <widget class="QDialogButtonBox" name="bb_OkCancel">
      <property name="standardButtons">
@@ -25,7 +40,7 @@
     </widget>
    </item>
    <item row="0" column="0">
-    <widget class="BlackGui::Components::CSettingsXSwiftBusComponent" name="comp_SettingsXSwiftBus">
+    <widget class="BlackGui::Components::CDBusServerAddressSelector" name="comp_SettingsXSwiftBus">
      <property name="minimumSize">
       <size>
        <width>0</width>
@@ -38,9 +53,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Components::CSettingsXSwiftBusComponent</class>
+   <class>BlackGui::Components::CDBusServerAddressSelector</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/settingsxswiftbuscomponent.h</header>
+   <header>blackgui/components/dbusserveraddressselector.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>