diff --git a/ground/openpilotgcs/src/plugins/config/configinputwidget.cpp b/ground/openpilotgcs/src/plugins/config/configinputwidget.cpp
index 64ce1b056..9a8a99f22 100644
--- a/ground/openpilotgcs/src/plugins/config/configinputwidget.cpp
+++ b/ground/openpilotgcs/src/plugins/config/configinputwidget.cpp
@@ -425,6 +425,10 @@ void ConfigInputWidget::goToWizard()
     actuatorSettingsData           = actuatorSettingsObj->getData();
     previousActuatorSettingsData   = actuatorSettingsData;
 
+    // Stash systemSettings
+    systemSettingsData             = systemSettingsObj->getData();
+    previousSystemSettingsData     = systemSettingsData;
+
     // Now reset channel and actuator settings (disable outputs)
     resetChannelSettings();
     resetActuatorSettings();
@@ -468,6 +472,7 @@ void ConfigInputWidget::wzCancel()
     manualSettingsObj->setData(previousManualSettingsData);
     flightModeSettingsObj->setData(previousFlightModeSettingsData);
     actuatorSettingsObj->setData(previousActuatorSettingsData);
+    systemSettingsObj->setData(previousSystemSettingsData);
 }
 
 void ConfigInputWidget::registerControlActivity()
diff --git a/ground/openpilotgcs/src/plugins/config/configinputwidget.h b/ground/openpilotgcs/src/plugins/config/configinputwidget.h
index 013a60c62..de8f38152 100644
--- a/ground/openpilotgcs/src/plugins/config/configinputwidget.h
+++ b/ground/openpilotgcs/src/plugins/config/configinputwidget.h
@@ -142,6 +142,7 @@ private:
 
     SystemSettings *systemSettingsObj;
     SystemSettings::DataFields systemSettingsData;
+    SystemSettings::DataFields previousSystemSettingsData;
 
     QSvgRenderer *m_renderer;