diff --git a/src/VehicleSetup/SetupView.qml b/src/VehicleSetup/SetupView.qml
index ca6a2b9422d6666287886869a624385b8f24d277..ab366415b27b327988981ffc6b014c7e7a578d00 100644
--- a/src/VehicleSetup/SetupView.qml
+++ b/src/VehicleSetup/SetupView.qml
@@ -98,8 +98,16 @@ Rectangle {
     Component.onCompleted: showSummaryPanel()
 
     Connections {
-        target: QGroundControl.multiVehicleManager
+        target: QGroundControl.corePlugin
+        onShowAdvancedUIChanged: {
+            if(!QGroundControl.corePlugin.showAdvancedUI) {
+                showSummaryPanel()
+            }
+        }
+    }
 
+    Connections {
+        target: QGroundControl.multiVehicleManager
         onParameterReadyVehicleAvailableChanged: {
             if(!QGroundControl.skipSetupPage) {
                 if (QGroundControl.multiVehicleManager.parameterReadyVehicleAvailable || summaryButton.checked || setupButtonGroup.current != firmwareButton) {
@@ -116,10 +124,8 @@ Rectangle {
 
     Component {
         id: noComponentsVehicleSummaryComponent
-
         Rectangle {
             color: qgcPal.windowShade
-
             QGCLabel {
                 anchors.margins:        _defaultTextWidth * 2
                 anchors.fill:           parent
@@ -129,7 +135,6 @@ Rectangle {
                 font.pointSize:         ScreenTools.mediumFontPointSize
                 text:                   qsTr("%1 does not currently support setup of your vehicle type. ").arg(QGroundControl.appName) +
                                         "If your vehicle is already configured you can still Fly."
-
                 onLinkActivated: Qt.openUrlExternally(link)
             }
         }
@@ -137,10 +142,8 @@ Rectangle {
 
     Component {
         id: disconnectedVehicleSummaryComponent
-
         Rectangle {
             color: qgcPal.windowShade
-
             QGCLabel {
                 anchors.margins:        _defaultTextWidth * 2
                 anchors.fill:           parent