diff --git a/src/uas/UAS.cc b/src/uas/UAS.cc
index 2bbc0927d77e2c416d2bd4cbcb1db1cc9d7737b2..c34c07057576bd164f6b8169d5a34ef7eaf42933 100644
--- a/src/uas/UAS.cc
+++ b/src/uas/UAS.cc
@@ -161,6 +161,7 @@ void UAS::receiveMessage(LinkInterface* link, mavlink_message_t message)
                     this->status = (int)state.status;
                     getStatusForCode((int)state.status, uasState, stateDescription);
                     emit statusChanged(this, uasState, stateDescription);
+                    emit statusChanged(this->status);
                     stateAudio = " changed status to " + uasState;
                 }
 
diff --git a/src/ui/uas/UASControlWidget.cc b/src/ui/uas/UASControlWidget.cc
index f28f7491960e6b7355d64b598883b2f1b6f3dc68..92192ce58e9b52f588a1e8bc96293797c64c37a5 100644
--- a/src/ui/uas/UASControlWidget.cc
+++ b/src/ui/uas/UASControlWidget.cc
@@ -181,7 +181,7 @@ void UASControlWidget::cycleContextButton()
     if (mav)
     {
 
-        if (engineOn)
+        if (!engineOn)
         {
             ui.controlButton->setText(tr("Stop Engine"));
             mav->setMode(MAV_MODE_MANUAL);