diff --git a/src/VehicleSetup/SetupView.qml b/src/VehicleSetup/SetupView.qml
index 18e50da45727022194981cf39baa9a048889a1d0..d3f73a50ba4215a8f2941e869a9eda98dc14e272 100644
--- a/src/VehicleSetup/SetupView.qml
+++ b/src/VehicleSetup/SetupView.qml
@@ -38,6 +38,7 @@ import QGroundControl.MultiVehicleManager   1.0
 Rectangle {
     color:  qgcPal.window
     z:      QGroundControl.zOrderTopMost
+    id: setupView
 
     QGCPalette { id: qgcPal; colorGroupEnabled: true }
 
@@ -110,6 +111,13 @@ Rectangle {
                 panelLoader.sourceComponent = messagePanelComponent
             } else {
                 panelLoader.source = vehicleComponent.setupSource
+                for(var i = 0; i < componentRepeater.count; i++) {
+                    var obj = componentRepeater.itemAt(i);
+                    if (obj.text === vehicleComponent.name) {
+                        obj.checked = true;
+                        break;
+                    }
+                }
             }
         }
     }
diff --git a/src/VehicleSetup/VehicleSummary.qml b/src/VehicleSetup/VehicleSummary.qml
index 18bf39b290e76ae21b219b0e910d18c40ed3b07d..977370f636b6d3a3e5ec57a71cbabf448f009360 100644
--- a/src/VehicleSetup/VehicleSummary.qml
+++ b/src/VehicleSetup/VehicleSummary.qml
@@ -117,19 +117,11 @@ Rectangle {
                         readonly property real titleHeight: ScreenTools.defaultFontPixelHeight * 2
 
                         // Title bar
-                        Rectangle {
+                        QGCButton {
                             id:     titleBar
                             width:  parent.width
                             height: titleHeight
-                            color:  qgcPal.windowShade
-
-                            // Title text
-                            QGCLabel {
-                                anchors.fill:           parent
-                                verticalAlignment:      TextEdit.AlignVCenter
-                                horizontalAlignment:    TextEdit.AlignHCenter
-                                text:                   capitalizeWords(modelData.name)
-                            }
+                            text:                   capitalizeWords(modelData.name)
 
                             // Setup indicator
                             Rectangle {
@@ -142,6 +134,10 @@ Rectangle {
                                 color:                  modelData.setupComplete ? "#00d932" : "red"
                                 visible:                modelData.requiresSetup
                             }
+
+                            onClicked : {
+                                setupView.showVehicleComponentPanel(modelData)
+                            }
                         }
 
                         // Summary Qml