2 files changed, 5 insertions, 2 deletions
diff --git a/src/systemtask/Messages.h b/src/systemtask/Messages.h
index cc30fdc..886505b 100644
--- a/src/systemtask/Messages.h
+++ b/src/systemtask/Messages.h
@@ -29,6 +29,7 @@ namespace Pinetime {
         BatteryPercentageUpdated,
         StartFileTransfer,
         StopFileTransfer,
+        AirplaneModeToggle
       };
     }
 }
diff --git a/src/systemtask/SystemTask.cpp b/src/systemtask/SystemTask.cpp
index a95d479..5ce223a 100644
--- a/src/systemtask/SystemTask.cpp
+++ b/src/systemtask/SystemTask.cpp
@@ -261,7 +261,7 @@ void SystemTask::Work() {
           displayApp.PushMessage(Pinetime::Applications::Display::Messages::GoToRunning);
           heartRateApp.PushMessage(Pinetime::Applications::HeartRateTask::Messages::WakeUp);
 
-          if (!bleController.IsConnected()) {
+          if (bleController.GetConnectState() == Controllers::Ble::ConnectStates::Disconnected) {
             nimbleController.RestartFastAdv();
           }
 
@@ -424,7 +424,9 @@ void SystemTask::Work() {
           motorController.RunForDuration(35);
           displayApp.PushMessage(Pinetime::Applications::Display::Messages::ShowPairingKey);
           break;
-
+        case Messages::AirplaneModeToggle:
+          nimbleController.SwitchAirplaneMode(settingsController.GetAirplaneMode());
+          break;
         default:
           break;
       }