diff --git a/src/AutoPilotPlugins/PX4/SensorsComponent.qml b/src/AutoPilotPlugins/PX4/SensorsComponent.qml
index 2085e4dc776c790fa84b2035c779bdb9ac3f3039..986702f10898ed03b456ba7554a917c0224b9dc9 100644
--- a/src/AutoPilotPlugins/PX4/SensorsComponent.qml
+++ b/src/AutoPilotPlugins/PX4/SensorsComponent.qml
@@ -427,13 +427,13 @@ QGCView {
                             calInProgressText:  controller.orientationCalDownSideRotate ? qsTr("Rotate") : qsTr("Hold Still")
                             imageSource:        controller.orientationCalDownSideRotate ? "qrc:///qmlimages/VehicleDownRotate.png" : "qrc:///qmlimages/VehicleDown.png"
                         }
-//                        VehicleRotationCal {
-//                            visible:            controller.orientationCalUpsideDownSideVisible
-//                            calValid:           controller.orientationCalUpsideDownSideDone
-//                            calInProgress:      controller.orientationCalUpsideDownSideInProgress
-//                            calInProgressText:  controller.orientationCalUpsideDownSideRotate ? qsTr("Rotate") : qsTr("Hold Still")
-//                            imageSource:        controller.orientationCalUpsideDownSideRotate ? "qrc:///qmlimages/VehicleUpsideDownRotate.png" : "qrc:///qmlimages/VehicleUpsideDown.png"
-//                        }
+                        VehicleRotationCal {
+                            visible:            controller.orientationCalUpsideDownSideVisible
+                            calValid:           controller.orientationCalUpsideDownSideDone
+                            calInProgress:      controller.orientationCalUpsideDownSideInProgress
+                            calInProgressText:  controller.orientationCalUpsideDownSideRotate ? qsTr("Rotate") : qsTr("Hold Still")
+                            imageSource:        controller.orientationCalUpsideDownSideRotate ? "qrc:///qmlimages/VehicleUpsideDownRotate.png" : "qrc:///qmlimages/VehicleUpsideDown.png"
+                        }
                         VehicleRotationCal {
                             visible:            controller.orientationCalNoseDownSideVisible
                             calValid:           controller.orientationCalNoseDownSideDone
@@ -441,13 +441,13 @@ QGCView {
                             calInProgressText:  controller.orientationCalNoseDownSideRotate ? qsTr("Rotate") : qsTr("Hold Still")
                             imageSource:        controller.orientationCalNoseDownSideRotate ? "qrc:///qmlimages/VehicleNoseDownRotate.png" : "qrc:///qmlimages/VehicleNoseDown.png"
                         }
-//                        VehicleRotationCal {
-//                            visible:            controller.orientationCalTailDownSideVisible
-//                            calValid:           controller.orientationCalTailDownSideDone
-//                            calInProgress:      controller.orientationCalTailDownSideInProgress
-//                            calInProgressText:  controller.orientationCalTailDownSideRotate ? qsTr("Rotate") : qsTr("Hold Still")
-//                            imageSource:        controller.orientationCalTailDownSideRotate ? "qrc:///qmlimages/VehicleTailDownRotate.png" : "qrc:///qmlimages/VehicleTailDown.png"
-//                        }
+                        VehicleRotationCal {
+                            visible:            controller.orientationCalTailDownSideVisible
+                            calValid:           controller.orientationCalTailDownSideDone
+                            calInProgress:      controller.orientationCalTailDownSideInProgress
+                            calInProgressText:  controller.orientationCalTailDownSideRotate ? qsTr("Rotate") : qsTr("Hold Still")
+                            imageSource:        controller.orientationCalTailDownSideRotate ? "qrc:///qmlimages/VehicleTailDownRotate.png" : "qrc:///qmlimages/VehicleTailDown.png"
+                        }
                         VehicleRotationCal {
                             visible:            controller.orientationCalLeftSideVisible
                             calValid:           controller.orientationCalLeftSideDone
@@ -455,13 +455,13 @@ QGCView {
                             calInProgressText:  controller.orientationCalLeftSideRotate ? qsTr("Rotate") : qsTr("Hold Still")
                             imageSource:        controller.orientationCalLeftSideRotate ? "qrc:///qmlimages/VehicleLeftRotate.png" : "qrc:///qmlimages/VehicleLeft.png"
                         }
-//                        VehicleRotationCal {
-//                            visible:            controller.orientationCalRightSideVisible
-//                            calValid:           controller.orientationCalRightSideDone
-//                            calInProgress:      controller.orientationCalRightSideInProgress
-//                            calInProgressText:  controller.orientationCalRightSideRotate ? qsTr("Rotate") : qsTr("Hold Still")
-//                            imageSource:        controller.orientationCalRightSideRotate ? "qrc:///qmlimages/VehicleRightRotate.png" : "qrc:///qmlimages/VehicleRight.png"
-//                        }
+                        VehicleRotationCal {
+                            visible:            controller.orientationCalRightSideVisible
+                            calValid:           controller.orientationCalRightSideDone
+                            calInProgress:      controller.orientationCalRightSideInProgress
+                            calInProgressText:  controller.orientationCalRightSideRotate ? qsTr("Rotate") : qsTr("Hold Still")
+                            imageSource:        controller.orientationCalRightSideRotate ? "qrc:///qmlimages/VehicleRightRotate.png" : "qrc:///qmlimages/VehicleRight.png"
+                        }
                     }
                 }
 
diff --git a/src/AutoPilotPlugins/PX4/SensorsComponentController.cc b/src/AutoPilotPlugins/PX4/SensorsComponentController.cc
index c28be78849f316078bcf4e96acf7308bdf1129dd..870b9a77eb77f52a257eb4c4ac3f0ec258775ee1 100644
--- a/src/AutoPilotPlugins/PX4/SensorsComponentController.cc
+++ b/src/AutoPilotPlugins/PX4/SensorsComponentController.cc
@@ -314,10 +314,10 @@ void SensorsComponentController::_handleUASTextMessage(int uasId, int compId, in
             } else if (text == "mag") {
                 _magCalInProgress = true;
                 _orientationCalDownSideVisible = true;
-                _orientationCalUpsideDownSideVisible = true;
+                _orientationCalUpsideDownSideVisible = false;
                 _orientationCalLeftSideVisible = true;
-                _orientationCalRightSideVisible = true;
-                _orientationCalTailDownSideVisible = true;
+                _orientationCalRightSideVisible = false;
+                _orientationCalTailDownSideVisible = false;
                 _orientationCalNoseDownSideVisible = true;
             } else if (text == "gyro") {
                 _gyroCalInProgress = true;