diff --git a/src/FlightMap/Widgets/InstrumentSwipeView.qml b/src/FlightMap/Widgets/InstrumentSwipeView.qml
index a1eaf5f408f3a259ee5e7e47d4036292f2142661..814b0b45a70de1a83fd6317999bdb8fcb7255665 100644
--- a/src/FlightMap/Widgets/InstrumentSwipeView.qml
+++ b/src/FlightMap/Widgets/InstrumentSwipeView.qml
@@ -29,6 +29,7 @@ Item {
 
     function showPage(pageIndex) {
         pageRow.x = -(pageIndex * _pageWidth)
+        _currentPage = pageIndex
     }
 
     function showNextPage() {
diff --git a/src/FlightMap/Widgets/VehicleHealthWidget.qml b/src/FlightMap/Widgets/VehicleHealthWidget.qml
index 3e7a35c929ad72dbc19c64708d5dd0ea2eb6c27d..85eb212490a1fa1892ee298d1ac1870756f7d550 100644
--- a/src/FlightMap/Widgets/VehicleHealthWidget.qml
+++ b/src/FlightMap/Widgets/VehicleHealthWidget.qml
@@ -30,7 +30,7 @@ QGCFlickable {
     // Any time the unhealthy sensors list changes, switch to the health page
     onUnhealthySensorsChanged: {
         if (unhealthySensors.length != 0) {
-            showPage(1)
+            showPage(2)
         }
     }