diff --git a/src/ui/QGCPX4VehicleConfig.cc b/src/ui/QGCPX4VehicleConfig.cc
index ac90a805e4dcbae811faa24490794f8d4e2de722..69b4bab5aab3c73d270c3544b230c238875b351f 100644
--- a/src/ui/QGCPX4VehicleConfig.cc
+++ b/src/ui/QGCPX4VehicleConfig.cc
@@ -95,14 +95,14 @@ QGCPX4VehicleConfig::QGCPX4VehicleConfig(QWidget *parent) :
     px4AirframeConfig = new QGCPX4AirframeConfig(this);
     ui->airframeLayout->addWidget(px4AirframeConfig);
 
-    px4SafetyConfig = new QGCPX4SafetyConfig(this);
-    ui->safetyConfigLayout->addWidget(px4SafetyConfig);
+    // px4SafetyConfig = new QGCPX4SafetyConfig(this);
+    // ui->safetyConfigLayout->addWidget(px4SafetyConfig);
 
-    px4TuningConfig = new QGCPX4TuningConfig(this);
-    ui->tuningLayout->addWidget(px4TuningConfig);
+    // px4TuningConfig = new QGCPX4TuningConfig(this);
+    // ui->tuningLayout->addWidget(px4TuningConfig);
 
-    px4FlightModeConfig = new QGCPX4FlightModeConfig(this);
-    ui->flightModeLayout->addWidget(px4FlightModeConfig);
+    // px4FlightModeConfig = new QGCPX4FlightModeConfig(this);
+    // ui->flightModeLayout->addWidget(px4FlightModeConfig);
 
     px4SensorCalibration = new QGCPX4SensorCalibration(this);
     ui->sensorLayout->addWidget(px4SensorCalibration);
@@ -306,7 +306,7 @@ void QGCPX4VehicleConfig::sensorMenuButtonClicked()
 
 void QGCPX4VehicleConfig::tuningMenuButtonClicked()
 {
-    ui->stackedWidget->setCurrentWidget(ui->generalTab);
+    ui->stackedWidget->setCurrentWidget(ui->tuningTab);
     ui->tabTitleLabel->setText(tr("Controller Tuning"));
 }
 
diff --git a/src/ui/QGCPX4VehicleConfig.h b/src/ui/QGCPX4VehicleConfig.h
index 7e302d0173bcde8cd77631935e27b2bc21944065..a0d6c23f101a4b518e69bff17a28990387cfad69 100644
--- a/src/ui/QGCPX4VehicleConfig.h
+++ b/src/ui/QGCPX4VehicleConfig.h
@@ -41,6 +41,8 @@ public slots:
     void rcMenuButtonClicked();
     void sensorMenuButtonClicked();
     void tuningMenuButtonClicked();
+    void flightModeMenuButtonClicked();
+    void safetyConfigMenuButtonClicked();
     void advancedMenuButtonClicked();
     void airframeMenuButtonClicked();
     void firmwareMenuButtonClicked();