diff --git a/scwx-qt/source/scwx/qt/ui/settings_dialog.cpp b/scwx-qt/source/scwx/qt/ui/settings_dialog.cpp
index 9cc80abf..e0996855 100644
--- a/scwx-qt/source/scwx/qt/ui/settings_dialog.cpp
+++ b/scwx-qt/source/scwx/qt/ui/settings_dialog.cpp
@@ -22,6 +22,7 @@
 #include <scwx/qt/types/time_types.hpp>
 #include <scwx/qt/ui/county_dialog.hpp>
 #include <scwx/qt/ui/radar_site_dialog.hpp>
+#include <scwx/qt/ui/serial_port_dialog.hpp>
 #include <scwx/qt/ui/settings/hotkey_settings_widget.hpp>
 #include <scwx/qt/ui/settings/unit_settings_widget.hpp>
 #include <scwx/qt/util/color.hpp>
@@ -102,6 +103,7 @@ public:
    explicit SettingsDialogImpl(SettingsDialog* self) :
        self_ {self},
        radarSiteDialog_ {new RadarSiteDialog(self)},
+       gpsSourceDialog_ {new SerialPortDialog(self)},
        countyDialog_ {new CountyDialog(self)},
        fontDialog_ {new QFontDialog(self)},
        fontCategoryModel_ {new QStandardItemModel(self)},
@@ -193,10 +195,11 @@ public:
                RadarSiteLabel(std::shared_ptr<config::RadarSite>& radarSite);
    static void SetBackgroundColor(const std::string& value, QFrame* frame);
 
-   SettingsDialog*  self_;
-   RadarSiteDialog* radarSiteDialog_;
-   CountyDialog*    countyDialog_;
-   QFontDialog*     fontDialog_;
+   SettingsDialog*   self_;
+   RadarSiteDialog*  radarSiteDialog_;
+   SerialPortDialog* gpsSourceDialog_;
+   CountyDialog*     countyDialog_;
+   QFontDialog*      fontDialog_;
 
    QStandardItemModel* fontCategoryModel_;
 
@@ -332,6 +335,32 @@ void SettingsDialogImpl::ConnectSignals()
                        }
                     });
 
+   QObject::connect(self_->ui->gpsSourceSelectButton,
+                    &QAbstractButton::clicked,
+                    self_,
+                    [this]() { gpsSourceDialog_->show(); });
+
+   QObject::connect(gpsSourceDialog_,
+                    &SerialPortDialog::accepted,
+                    self_,
+                    [this]()
+                    {
+                       std::string serialPort = gpsSourceDialog_->serial_port();
+                       int         baudRate   = gpsSourceDialog_->baud_rate();
+
+                       if (!serialPort.empty() && serialPort != "?")
+                       {
+                          std::string source =
+                             fmt::format("serial:{}", serialPort);
+                          nmeaSource_.StageValue(source);
+                       }
+
+                       if (baudRate > 0)
+                       {
+                          self_->ui->nmeaBaudRateSpinBox->setValue(baudRate);
+                       }
+                    });
+
    // Update the Radar Site dialog "map" location with the currently selected
    // radar site
    auto& defaultRadarSite = *defaultRadarSite_.GetSettingsVariable();
@@ -559,6 +588,25 @@ void SettingsDialogImpl::SetupGeneralTab()
                            types::GetDefaultTimeZoneName);
    defaultTimeZone_.SetResetButton(self_->ui->resetDefaultTimeZoneButton);
 
+   QObject::connect(
+      self_->ui->positioningPluginComboBox,
+      &QComboBox::currentTextChanged,
+      self_,
+      [this](const QString& text)
+      {
+         types::PositioningPlugin positioningPlugin =
+            types::GetPositioningPlugin(text.toStdString());
+
+         bool gpsSourceEnabled =
+            positioningPlugin == types::PositioningPlugin::Nmea;
+
+         self_->ui->nmeaSourceLineEdit->setEnabled(gpsSourceEnabled);
+         self_->ui->gpsSourceSelectButton->setEnabled(gpsSourceEnabled);
+         self_->ui->nmeaBaudRateSpinBox->setEnabled(gpsSourceEnabled);
+         self_->ui->resetNmeaSourceButton->setEnabled(gpsSourceEnabled);
+         self_->ui->resetNmeaBaudRateButton->setEnabled(gpsSourceEnabled);
+      });
+
    positioningPlugin_.SetSettingsVariable(generalSettings.positioning_plugin());
    SCWX_SETTINGS_COMBO_BOX(positioningPlugin_,
                            self_->ui->positioningPluginComboBox,
diff --git a/scwx-qt/source/scwx/qt/ui/settings_dialog.ui b/scwx-qt/source/scwx/qt/ui/settings_dialog.ui
index 4364ba58..fe0efa6e 100644
--- a/scwx-qt/source/scwx/qt/ui/settings_dialog.ui
+++ b/scwx-qt/source/scwx/qt/ui/settings_dialog.ui
@@ -159,6 +159,48 @@
                   <property name="bottomMargin">
                    <number>0</number>
                   </property>
+                  <item row="13" column="0">
+                   <widget class="QLabel" name="label_6">
+                    <property name="text">
+                     <string>MapTiler API Key</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="6" column="4">
+                   <widget class="QToolButton" name="resetGridHeightButton">
+                    <property name="text">
+                     <string>...</string>
+                    </property>
+                    <property name="icon">
+                     <iconset resource="../../../../scwx-qt.qrc">
+                      <normaloff>:/res/icons/font-awesome-6/rotate-left-solid.svg</normaloff>:/res/icons/font-awesome-6/rotate-left-solid.svg</iconset>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="11" column="2">
+                   <widget class="QComboBox" name="mapProviderComboBox"/>
+                  </item>
+                  <item row="4" column="0">
+                   <widget class="QLabel" name="label_21">
+                    <property name="text">
+                     <string>Default Time Zone</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="12" column="4">
+                   <widget class="QToolButton" name="resetMapboxApiKeyButton">
+                    <property name="text">
+                     <string>...</string>
+                    </property>
+                    <property name="icon">
+                     <iconset resource="../../../../scwx-qt.qrc">
+                      <normaloff>:/res/icons/font-awesome-6/rotate-left-solid.svg</normaloff>:/res/icons/font-awesome-6/rotate-left-solid.svg</iconset>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="6" column="2">
+                   <widget class="QSpinBox" name="gridHeightSpinBox"/>
+                  </item>
                   <item row="4" column="4">
                    <widget class="QToolButton" name="resetDefaultTimeZoneButton">
                     <property name="text">
@@ -170,8 +212,18 @@
                     </property>
                    </widget>
                   </item>
-                  <item row="9" column="4">
-                   <widget class="QToolButton" name="resetMapboxApiKeyButton">
+                  <item row="11" column="0">
+                   <widget class="QLabel" name="label_7">
+                    <property name="text">
+                     <string>Map Provider</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="4" column="2">
+                   <widget class="QComboBox" name="defaultTimeZoneComboBox"/>
+                  </item>
+                  <item row="18" column="4">
+                   <widget class="QToolButton" name="resetThemeButton">
                     <property name="text">
                      <string>...</string>
                     </property>
@@ -181,21 +233,51 @@
                     </property>
                    </widget>
                   </item>
-                  <item row="1" column="0">
-                   <widget class="QLabel" name="label_20">
+                  <item row="1" column="2">
+                   <widget class="QComboBox" name="clockFormatComboBox"/>
+                  </item>
+                  <item row="3" column="2">
+                   <widget class="QComboBox" name="radarSiteComboBox"/>
+                  </item>
+                  <item row="9" column="3">
+                   <widget class="QToolButton" name="gpsSourceSelectButton">
                     <property name="text">
-                     <string>Clock Format</string>
+                     <string>...</string>
                     </property>
                    </widget>
                   </item>
-                  <item row="14" column="0">
-                   <widget class="QLabel" name="label_25">
-                    <property name="text">
-                     <string>NMEA Source</string>
+                  <item row="12" column="2">
+                   <widget class="QLineEdit" name="mapboxApiKeyLineEdit">
+                    <property name="echoMode">
+                     <enum>QLineEdit::EchoMode::Password</enum>
                     </property>
                    </widget>
                   </item>
-                  <item row="18" column="4">
+                  <item row="8" column="0">
+                   <widget class="QLabel" name="label_23">
+                    <property name="text">
+                     <string>GPS Plugin</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="10" column="0">
+                   <widget class="QLabel" name="label_24">
+                    <property name="text">
+                     <string>GPS Baud Rate</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="5" column="2">
+                   <widget class="QSpinBox" name="gridWidthSpinBox"/>
+                  </item>
+                  <item row="3" column="3">
+                   <widget class="QToolButton" name="radarSiteSelectButton">
+                    <property name="text">
+                     <string>...</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="21" column="4">
                    <widget class="QToolButton" name="resetWarningsProviderButton">
                     <property name="text">
                      <string>...</string>
@@ -206,10 +288,47 @@
                     </property>
                    </widget>
                   </item>
-                  <item row="9" column="0">
-                   <widget class="QLabel" name="label_4">
+                  <item row="5" column="0">
+                   <widget class="QLabel" name="label_2">
                     <property name="text">
-                     <string>Mapbox API Key</string>
+                     <string>Grid Width</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="9" column="2">
+                   <widget class="QLineEdit" name="nmeaSourceLineEdit"/>
+                  </item>
+                  <item row="18" column="2">
+                   <widget class="QComboBox" name="themeComboBox"/>
+                  </item>
+                  <item row="8" column="2">
+                   <widget class="QComboBox" name="positioningPluginComboBox"/>
+                  </item>
+                  <item row="9" column="0">
+                   <widget class="QLabel" name="label_25">
+                    <property name="text">
+                     <string>GPS Source</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="21" column="2">
+                   <widget class="QLineEdit" name="warningsProviderLineEdit"/>
+                  </item>
+                  <item row="3" column="0">
+                   <widget class="QLabel" name="label">
+                    <property name="text">
+                     <string>Default Radar Site</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="3" column="4">
+                   <widget class="QToolButton" name="resetRadarSiteButton">
+                    <property name="text">
+                     <string>...</string>
+                    </property>
+                    <property name="icon">
+                     <iconset resource="../../../../scwx-qt.qrc">
+                      <normaloff>:/res/icons/font-awesome-6/rotate-left-solid.svg</normaloff>:/res/icons/font-awesome-6/rotate-left-solid.svg</iconset>
                     </property>
                    </widget>
                   </item>
@@ -220,84 +339,24 @@
                     </property>
                    </widget>
                   </item>
-                  <item row="3" column="3">
-                   <widget class="QToolButton" name="radarSiteSelectButton">
+                  <item row="2" column="4">
+                   <widget class="QToolButton" name="resetDefaultAlertActionButton">
                     <property name="text">
                      <string>...</string>
                     </property>
+                    <property name="icon">
+                     <iconset resource="../../../../scwx-qt.qrc">
+                      <normaloff>:/res/icons/font-awesome-6/rotate-left-solid.svg</normaloff>:/res/icons/font-awesome-6/rotate-left-solid.svg</iconset>
+                    </property>
                    </widget>
                   </item>
                   <item row="18" column="0">
-                   <widget class="QLabel" name="label_22">
-                    <property name="text">
-                     <string>Warnings Provider</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="1" column="2">
-                   <widget class="QComboBox" name="clockFormatComboBox"/>
-                  </item>
-                  <item row="5" column="0">
-                   <widget class="QLabel" name="label_2">
-                    <property name="text">
-                     <string>Grid Width</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="3" column="2">
-                   <widget class="QComboBox" name="radarSiteComboBox"/>
-                  </item>
-                  <item row="2" column="0">
-                   <widget class="QLabel" name="defaultAlertActionLabel">
-                    <property name="text">
-                     <string>Default Alert Action</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="4" column="0">
-                   <widget class="QLabel" name="label_21">
-                    <property name="text">
-                     <string>Default Time Zone</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="13" column="0">
-                   <widget class="QLabel" name="label_24">
-                    <property name="text">
-                     <string>NMEA Baud Rate</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="2" column="2">
-                   <widget class="QComboBox" name="defaultAlertActionComboBox"/>
-                  </item>
-                  <item row="10" column="0">
-                   <widget class="QLabel" name="label_6">
-                    <property name="text">
-                     <string>MapTiler API Key</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="15" column="2">
-                   <widget class="QComboBox" name="themeComboBox"/>
-                  </item>
-                  <item row="15" column="0">
                    <widget class="QLabel" name="label_5">
                     <property name="text">
                      <string>Theme</string>
                     </property>
                    </widget>
                   </item>
-                  <item row="11" column="2">
-                   <widget class="QComboBox" name="positioningPluginComboBox"/>
-                  </item>
-                  <item row="3" column="0">
-                   <widget class="QLabel" name="label">
-                    <property name="text">
-                     <string>Default Radar Site</string>
-                    </property>
-                   </widget>
-                  </item>
                   <item row="1" column="4">
                    <widget class="QToolButton" name="resetClockFormatButton">
                     <property name="text">
@@ -309,83 +368,27 @@
                     </property>
                    </widget>
                   </item>
-                  <item row="6" column="2">
-                   <widget class="QSpinBox" name="gridHeightSpinBox"/>
-                  </item>
-                  <item row="3" column="4">
-                   <widget class="QToolButton" name="resetRadarSiteButton">
+                  <item row="12" column="0">
+                   <widget class="QLabel" name="label_4">
                     <property name="text">
-                     <string>...</string>
-                    </property>
-                    <property name="icon">
-                     <iconset resource="../../../../scwx-qt.qrc">
-                      <normaloff>:/res/icons/font-awesome-6/rotate-left-solid.svg</normaloff>:/res/icons/font-awesome-6/rotate-left-solid.svg</iconset>
+                     <string>Mapbox API Key</string>
                     </property>
                    </widget>
                   </item>
-                  <item row="4" column="2">
-                   <widget class="QComboBox" name="defaultTimeZoneComboBox"/>
-                  </item>
-                  <item row="10" column="4">
-                   <widget class="QToolButton" name="resetMapTilerApiKeyButton">
+                  <item row="1" column="0">
+                   <widget class="QLabel" name="label_20">
                     <property name="text">
-                     <string>...</string>
-                    </property>
-                    <property name="icon">
-                     <iconset resource="../../../../scwx-qt.qrc">
-                      <normaloff>:/res/icons/font-awesome-6/rotate-left-solid.svg</normaloff>:/res/icons/font-awesome-6/rotate-left-solid.svg</iconset>
+                     <string>Clock Format</string>
                     </property>
                    </widget>
                   </item>
-                  <item row="18" column="2">
-                   <widget class="QLineEdit" name="warningsProviderLineEdit"/>
-                  </item>
-                  <item row="6" column="4">
-                   <widget class="QToolButton" name="resetGridHeightButton">
-                    <property name="text">
-                     <string>...</string>
-                    </property>
-                    <property name="icon">
-                     <iconset resource="../../../../scwx-qt.qrc">
-                      <normaloff>:/res/icons/font-awesome-6/rotate-left-solid.svg</normaloff>:/res/icons/font-awesome-6/rotate-left-solid.svg</iconset>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="15" column="4">
-                   <widget class="QToolButton" name="resetThemeButton">
-                    <property name="text">
-                     <string>...</string>
-                    </property>
-                    <property name="icon">
-                     <iconset resource="../../../../scwx-qt.qrc">
-                      <normaloff>:/res/icons/font-awesome-6/rotate-left-solid.svg</normaloff>:/res/icons/font-awesome-6/rotate-left-solid.svg</iconset>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="9" column="2">
-                   <widget class="QLineEdit" name="mapboxApiKeyLineEdit">
+                  <item row="13" column="2">
+                   <widget class="QLineEdit" name="mapTilerApiKeyLineEdit">
                     <property name="echoMode">
                      <enum>QLineEdit::EchoMode::Password</enum>
                     </property>
                    </widget>
                   </item>
-                  <item row="8" column="2">
-                   <widget class="QComboBox" name="mapProviderComboBox"/>
-                  </item>
-                  <item row="2" column="4">
-                   <widget class="QToolButton" name="resetDefaultAlertActionButton">
-                    <property name="text">
-                     <string>...</string>
-                    </property>
-                    <property name="icon">
-                     <iconset resource="../../../../scwx-qt.qrc">
-                      <normaloff>:/res/icons/font-awesome-6/rotate-left-solid.svg</normaloff>:/res/icons/font-awesome-6/rotate-left-solid.svg</iconset>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="5" column="2">
-                   <widget class="QSpinBox" name="gridWidthSpinBox"/>
-                  </item>
                   <item row="5" column="4">
                    <widget class="QToolButton" name="resetGridWidthButton">
                     <property name="text">
@@ -397,7 +400,45 @@
                     </property>
                    </widget>
                   </item>
-                  <item row="8" column="4">
+                  <item row="13" column="4">
+                   <widget class="QToolButton" name="resetMapTilerApiKeyButton">
+                    <property name="text">
+                     <string>...</string>
+                    </property>
+                    <property name="icon">
+                     <iconset resource="../../../../scwx-qt.qrc">
+                      <normaloff>:/res/icons/font-awesome-6/rotate-left-solid.svg</normaloff>:/res/icons/font-awesome-6/rotate-left-solid.svg</iconset>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="2" column="2">
+                   <widget class="QComboBox" name="defaultAlertActionComboBox"/>
+                  </item>
+                  <item row="21" column="0">
+                   <widget class="QLabel" name="label_22">
+                    <property name="text">
+                     <string>Warnings Provider</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="10" column="2">
+                   <widget class="QSpinBox" name="nmeaBaudRateSpinBox">
+                    <property name="minimum">
+                     <number>1</number>
+                    </property>
+                    <property name="maximum">
+                     <number>999999999</number>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="2" column="0">
+                   <widget class="QLabel" name="defaultAlertActionLabel">
+                    <property name="text">
+                     <string>Default Alert Action</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="11" column="4">
                    <widget class="QToolButton" name="resetMapProviderButton">
                     <property name="text">
                      <string>...</string>
@@ -408,41 +449,7 @@
                     </property>
                    </widget>
                   </item>
-                  <item row="8" column="0">
-                   <widget class="QLabel" name="label_7">
-                    <property name="text">
-                     <string>Map Provider</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="10" column="2">
-                   <widget class="QLineEdit" name="mapTilerApiKeyLineEdit">
-                    <property name="echoMode">
-                     <enum>QLineEdit::EchoMode::Password</enum>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="11" column="0">
-                   <widget class="QLabel" name="label_23">
-                    <property name="text">
-                     <string>Positioning Plugin</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="14" column="2">
-                   <widget class="QLineEdit" name="nmeaSourceLineEdit"/>
-                  </item>
-                  <item row="13" column="2">
-                   <widget class="QSpinBox" name="nmeaBaudRateSpinBox">
-                    <property name="minimum">
-                     <number>1</number>
-                    </property>
-                    <property name="maximum">
-                     <number>999999999</number>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="11" column="4">
+                  <item row="8" column="4">
                    <widget class="QToolButton" name="resetPositioningPluginButton">
                     <property name="text">
                      <string>...</string>
@@ -453,8 +460,8 @@
                     </property>
                    </widget>
                   </item>
-                  <item row="13" column="4">
-                   <widget class="QToolButton" name="resetNmeaBaudRateButton">
+                  <item row="9" column="4">
+                   <widget class="QToolButton" name="resetNmeaSourceButton">
                     <property name="text">
                      <string>...</string>
                     </property>
@@ -464,8 +471,8 @@
                     </property>
                    </widget>
                   </item>
-                  <item row="14" column="4">
-                   <widget class="QToolButton" name="resetNmeaSourceButton">
+                  <item row="10" column="4">
+                   <widget class="QToolButton" name="resetNmeaBaudRateButton">
                     <property name="text">
                      <string>...</string>
                     </property>