diff --git a/src/VehicleSetup/SetupView.qml b/src/VehicleSetup/SetupView.qml
index d4a69d0b4467ad13783b54e620d7df59256e98c0..63123d52ebafe3ee2b802a21590c1322bf52f234 100644
--- a/src/VehicleSetup/SetupView.qml
+++ b/src/VehicleSetup/SetupView.qml
@@ -120,9 +120,11 @@ Rectangle {
         target: multiVehicleManager
 
         onParameterReadyVehicleAvailableChanged: {
-            if (parameterReadyVehicleAvailable || summaryButton.checked) {
-                // When a new vehicle shows up we switch to the Summary View. If the Summary View is already showing
-                // and a vehicle goes away, we must reload it to show new disconnected Qml
+            if (parameterReadyVehicleAvailable || summaryButton.checked || setupButtonGroup.current != firmwareButton) {
+                // Show/Reload the Summary panel when:
+                //      A new vehicle shows up
+                //      The summary panel is already showing and the active vehicle goes away
+                //      The active vehicle goes away and we are not on the Firmware panel.
                 summaryButton.checked = true
                 showSummaryPanel()
             }