diff --git a/src/AutoPilotPlugins/PX4/PowerComponentController.cc b/src/AutoPilotPlugins/PX4/PowerComponentController.cc
index 604fee7c2e6be558e08cc5b8ae6fc60de6081b26..24dd2faac2b9279b935d0eef9ccf88c3dae51e6b 100644
--- a/src/AutoPilotPlugins/PX4/PowerComponentController.cc
+++ b/src/AutoPilotPlugins/PX4/PowerComponentController.cc
@@ -36,11 +36,6 @@ PowerComponentController::PowerComponentController(void)
 
 }
 
-PowerComponentController::~PowerComponentController()
-{
-    _stopCalibration();
-}
-
 void PowerComponentController::calibrateEsc(void)
 {
     _warningMessages.clear();
diff --git a/src/AutoPilotPlugins/PX4/PowerComponentController.h b/src/AutoPilotPlugins/PX4/PowerComponentController.h
index 5e608c7ca141af3012196b9d01921674a771c441..d6a35c973d53bc3f8a554659c969cc900dc9df1b 100644
--- a/src/AutoPilotPlugins/PX4/PowerComponentController.h
+++ b/src/AutoPilotPlugins/PX4/PowerComponentController.h
@@ -40,7 +40,6 @@ class PowerComponentController : public FactPanelController
     
 public:
     PowerComponentController(void);
-    ~PowerComponentController();
     
     Q_INVOKABLE void calibrateEsc(void);
     Q_INVOKABLE void busConfigureActuators(void);
diff --git a/src/ui/SettingsDialog.cc b/src/ui/SettingsDialog.cc
index e72ed0164e5c10564ee5feac08c135e81b53321f..bc57affdcaadaab9a412f54ed7a4da2c71bc5278 100644
--- a/src/ui/SettingsDialog.cc
+++ b/src/ui/SettingsDialog.cc
@@ -60,6 +60,8 @@ SettingsDialog::SettingsDialog(QWidget *parent, Qt::WindowFlags flags)
     this->window()->setWindowTitle(tr("QGroundControl Settings"));
 
     _ui->tabWidget->setCurrentWidget(pMavsettings);
+
+    connect(_ui->buttonBox, &QDialogButtonBox::accepted, this, &SettingsDialog::accept);
 }
 
 SettingsDialog::~SettingsDialog()