diff --git a/selfdrive/ui/sunnypilot/qt/offroad/settings/device_panel.cc b/selfdrive/ui/sunnypilot/qt/offroad/settings/device_panel.cc
index 0abbb5ba34..8295789f0a 100644
--- a/selfdrive/ui/sunnypilot/qt/offroad/settings/device_panel.cc
+++ b/selfdrive/ui/sunnypilot/qt/offroad/settings/device_panel.cc
@@ -83,12 +83,12 @@ DevicePanelSP::DevicePanelSP(SettingsWindowSP *parent) : DevicePanel(parent) {
   connect(maxTimeOffroad, &OptionControlSP::updateLabels, maxTimeOffroad, &MaxTimeOffroad::refresh);
   addItem(maxTimeOffroad);
 
-    toggleDeviceBootMode = new ButtonParamControlSP("DeviceBootMode", tr("Wake-Up Behavior"), "", "", {"Default", "Offroad"}, 375, true);
+  toggleDeviceBootMode = new ButtonParamControlSP("DeviceBootMode", tr("Wake-Up Behavior"), "", "", {"Default", "Offroad"}, 375, true);
   addItem(toggleDeviceBootMode);
 
   connect(toggleDeviceBootMode, &ButtonParamControlSP::buttonClicked, this, [=](int index) {
     params.put("DeviceBootMode", QString::number(index).toStdString());
-    updateState();
+    updateState(offroad);
   });
 
   addItem(device_grid_layout);
@@ -116,14 +116,13 @@ DevicePanelSP::DevicePanelSP(SettingsWindowSP *parent) : DevicePanel(parent) {
   offroadBtn->setFixedWidth(power_layout->sizeHint().width());
   QObject::connect(offroadBtn, &PushButtonSP::clicked, this, &DevicePanelSP::setOffroadMode);
 
-  QVBoxLayout *power_group_layout = new QVBoxLayout();
+  power_group_layout = new QVBoxLayout();
   power_group_layout->setSpacing(25);
-  power_group_layout->addWidget(offroadBtn, 0, Qt::AlignHCenter);
   power_group_layout->addLayout(power_layout);
 
   addItem(power_group_layout);
 
-  std::vector always_enabled_btns = {
+  always_enabled_btns = {
     rebootBtn,
     poweroffBtn,
     offroadBtn,
@@ -131,15 +130,7 @@ DevicePanelSP::DevicePanelSP(SettingsWindowSP *parent) : DevicePanel(parent) {
     buttons["onroadUploadsBtn"],
   };
 
-  QObject::connect(uiState(), &UIState::offroadTransition, [=](bool offroad) {
-    for (auto btn : findChildren<PushButtonSP*>()) {
-      bool always_enabled = std::find(always_enabled_btns.begin(), always_enabled_btns.end(), btn) != always_enabled_btns.end();
-
-      if (!always_enabled) {
-        btn->setEnabled(offroad);
-      }
-    }
-  });
+  QObject::connect(uiState(), &UIState::offroadTransition, this, &DevicePanelSP::updateState);
 }
 
 void DevicePanelSP::setOffroadMode() {
@@ -163,7 +154,7 @@ void DevicePanelSP::setOffroadMode() {
     ConfirmationDialog::alert(tr("Disengage to Enter Always Offroad Mode"), this);
   }
 
-  updateState();
+  updateState(offroad);
 }
 
 void DevicePanelSP::resetSettings() {
@@ -180,16 +171,20 @@ void DevicePanelSP::resetSettings() {
 }
 
 void DevicePanelSP::showEvent(QShowEvent *event) {
-  updateState();
+  updateState(offroad);
 }
 
-void DevicePanelSP::updateState() {
-  if (!isVisible()) {
-    return;
+void DevicePanelSP::updateState(bool _offroad) {
+  for (auto btn : findChildren<PushButtonSP*>()) {
+    bool always_enabled = std::find(always_enabled_btns.begin(), always_enabled_btns.end(), btn) != always_enabled_btns.end();
+
+    if (!always_enabled) {
+      btn->setEnabled(_offroad);
+    }
   }
 
   bool offroad_mode_param = params.getBool("OffroadMode");
-  offroadBtn->setText(offroad_mode_param ? tr("Exit Always Offroad") : tr("Always Offroad"));
+  offroadBtn->setText(offroad_mode_param ? tr("Exit Always Offroad") : tr("Enable Always Offroad"));
   offroadBtn->setStyleSheet(offroad_mode_param ? alwaysOffroadStyle : autoOffroadStyle);
 
   DeviceSleepModeStatus currStatus = DeviceSleepModeStatus::DEFAULT;
@@ -197,4 +192,12 @@ void DevicePanelSP::updateState() {
     currStatus = DeviceSleepModeStatus::OFFROAD;
   }
   toggleDeviceBootMode->setDescription(deviceSleepModeDescription(currStatus));
+
+  if (offroad and not offroad_mode_param) {
+    power_group_layout->insertWidget(0, offroadBtn, 0, Qt::AlignHCenter);
+  } else {
+    AddWidgetAt(0, offroadBtn);
+  }
+
+  offroad = _offroad;
 }
diff --git a/selfdrive/ui/sunnypilot/qt/offroad/settings/device_panel.h b/selfdrive/ui/sunnypilot/qt/offroad/settings/device_panel.h
index f6d21699ff..425c4528a1 100644
--- a/selfdrive/ui/sunnypilot/qt/offroad/settings/device_panel.h
+++ b/selfdrive/ui/sunnypilot/qt/offroad/settings/device_panel.h
@@ -23,7 +23,7 @@ public:
   explicit DevicePanelSP(SettingsWindowSP *parent = 0);
   void showEvent(QShowEvent *event) override;
   void setOffroadMode();
-  void updateState();
+  void updateState(bool _offroad);
   void resetSettings();
 
 private:
@@ -31,6 +31,10 @@ private:
   PushButtonSP *offroadBtn;
   MaxTimeOffroad *maxTimeOffroad;
   ButtonParamControlSP *toggleDeviceBootMode;
+  QVBoxLayout *power_group_layout;
+  bool offroad;
+
+  std::vector<PushButtonSP*> always_enabled_btns = {};
 
   const QString alwaysOffroadStyle = R"(
     PushButtonSP {