diff --git a/src/AutoPilotPlugins/PX4/SensorsComponent.qml b/src/AutoPilotPlugins/PX4/SensorsComponent.qml
index 7c00bd8bfa2e2d6a7c80677fd8e1d7401e4ee440..c28cbcfbaca9280c884b8d2f80a32c71889a983a 100644
--- a/src/AutoPilotPlugins/PX4/SensorsComponent.qml
+++ b/src/AutoPilotPlugins/PX4/SensorsComponent.qml
@@ -186,7 +186,7 @@ QGCView {
                 Component {
                     id: compass0ComponentLabel
 
-                    QGCLabel { text: "Compass Orientation" }
+                    QGCLabel { text: "External Compass Orientation" }
                 }
                 Component {
                     id: compass0ComponentCombo
@@ -470,7 +470,7 @@ QGCView {
                     Column {
                         x: parent.width - rotationColumnWidth
 
-                        QGCLabel { text: "Autpilot Orientation" }
+                        QGCLabel { text: "Autopilot Orientation" }
 
                         FactComboBox {
                             id:     boardRotationCombo
@@ -483,7 +483,7 @@ QGCView {
                         Component {
                             id: compass0ComponentLabel2
 
-                            QGCLabel { text: "Compass Orientation" }
+                            QGCLabel { text: "External Compass Orientation" }
                         }
                         Component {
                             id: compass0ComponentCombo2
diff --git a/src/QmlControls/QGCView.qml b/src/QmlControls/QGCView.qml
index 092a5ee1a93bc03db7b72c869a410665ac8f231d..f02715e3ff3833704cc14343419e0a029240a1ba 100644
--- a/src/QmlControls/QGCView.qml
+++ b/src/QmlControls/QGCView.qml
@@ -106,7 +106,15 @@ FactPanel {
         }
     }
 
+    function __stopAllAnimations() {
+        if (__animateHideDialog.running) {
+            __animateHideDialog.stop()
+        }
+    }
+
     function showDialog(component, title, charWidth, buttons) {
+        __stopAllAnimations()
+
         __dialogCharWidth = charWidth
         __dialogTitle = title
 
@@ -120,6 +128,8 @@ FactPanel {
     }
 
     function showMessage(title, message, buttons) {
+        __stopAllAnimations()
+
         __dialogCharWidth = 50
         __dialogTitle = title
         __messageDialogText = message