2 files changed, 8 insertions, 4 deletions
diff --git a/src/systemtask/Messages.h b/src/systemtask/Messages.h
index ad13244..2e3456a 100644
--- a/src/systemtask/Messages.h
+++ b/src/systemtask/Messages.h
@@ -31,7 +31,7 @@ namespace Pinetime {
         BatteryPercentageUpdated,
         StartFileTransfer,
         StopFileTransfer,
-        AirplaneModeToggle
+        BleRadioEnableToggle
       };
     }
 }
diff --git a/src/systemtask/SystemTask.cpp b/src/systemtask/SystemTask.cpp
index 75a71ec..1e45fac 100644
--- a/src/systemtask/SystemTask.cpp
+++ b/src/systemtask/SystemTask.cpp
@@ -254,7 +254,7 @@ void SystemTask::Work() {
           displayApp.PushMessage(Pinetime::Applications::Display::Messages::GoToRunning);
           heartRateApp.PushMessage(Pinetime::Applications::HeartRateTask::Messages::WakeUp);
 
-          if (bleController.GetConnectState() == Controllers::Ble::ConnectStates::Disconnected) {
+          if (bleController.IsRadioEnabled() && !bleController.IsConnected()) {
             nimbleController.RestartFastAdv();
           }
 
@@ -440,8 +440,12 @@ void SystemTask::Work() {
           motorController.RunForDuration(35);
           displayApp.PushMessage(Pinetime::Applications::Display::Messages::ShowPairingKey);
           break;
-        case Messages::AirplaneModeToggle:
-          nimbleController.SwitchAirplaneMode(settingsController.GetAirplaneMode());
+        case Messages::BleRadioEnableToggle:
+          if(settingsController.GetBleRadioEnabled()) {
+            nimbleController.EnableRadio();
+          } else {
+            nimbleController.DisableRadio();
+          }
           break;
         default:
           break;