diff --git a/selfdrive/ui/sunnypilot/qt/offroad/settings/longitudinal/speed_limit/speed_limit_settings.cc b/selfdrive/ui/sunnypilot/qt/offroad/settings/longitudinal/speed_limit/speed_limit_settings.cc
index ff5d6221c..3efbfeed8 100644
--- a/selfdrive/ui/sunnypilot/qt/offroad/settings/longitudinal/speed_limit/speed_limit_settings.cc
+++ b/selfdrive/ui/sunnypilot/qt/offroad/settings/longitudinal/speed_limit/speed_limit_settings.cc
@@ -158,3 +158,7 @@ void SpeedLimitSettings::refresh() {
 void SpeedLimitSettings::showEvent(QShowEvent *event) {
   refresh();
 }
+
+void SpeedLimitSettings::hideEvent(QHideEvent *event) {
+  setCurrentWidget(subPanelFrame);
+}
diff --git a/selfdrive/ui/sunnypilot/qt/offroad/settings/longitudinal/speed_limit/speed_limit_settings.h b/selfdrive/ui/sunnypilot/qt/offroad/settings/longitudinal/speed_limit/speed_limit_settings.h
index f76f9bea2..23fa7b4ec 100644
--- a/selfdrive/ui/sunnypilot/qt/offroad/settings/longitudinal/speed_limit/speed_limit_settings.h
+++ b/selfdrive/ui/sunnypilot/qt/offroad/settings/longitudinal/speed_limit/speed_limit_settings.h
@@ -21,6 +21,7 @@ public:
   SpeedLimitSettings(QWidget *parent = nullptr);
   void refresh();
   void showEvent(QShowEvent *event) override;
+  void hideEvent(QHideEvent *event) override;
 
 signals:
   void backPress();
diff --git a/selfdrive/ui/sunnypilot/qt/offroad/settings/longitudinal_panel.cc b/selfdrive/ui/sunnypilot/qt/offroad/settings/longitudinal_panel.cc
index 3e3977ff6..31124a324 100644
--- a/selfdrive/ui/sunnypilot/qt/offroad/settings/longitudinal_panel.cc
+++ b/selfdrive/ui/sunnypilot/qt/offroad/settings/longitudinal_panel.cc
@@ -86,6 +86,10 @@ void LongitudinalPanel::showEvent(QShowEvent *event) {
   refresh(offroad);
 }
 
+void LongitudinalPanel::hideEvent(QHideEvent *event) {
+  main_layout->setCurrentWidget(cruisePanelScreen);
+}
+
 void LongitudinalPanel::refresh(bool _offroad) {
   auto cp_bytes = params.get("CarParamsPersistent");
   auto cp_sp_bytes = params.get("CarParamsSPPersistent");
diff --git a/selfdrive/ui/sunnypilot/qt/offroad/settings/longitudinal_panel.h b/selfdrive/ui/sunnypilot/qt/offroad/settings/longitudinal_panel.h
index 0b7f39c64..a94369a56 100644
--- a/selfdrive/ui/sunnypilot/qt/offroad/settings/longitudinal_panel.h
+++ b/selfdrive/ui/sunnypilot/qt/offroad/settings/longitudinal_panel.h
@@ -18,6 +18,7 @@ class LongitudinalPanel : public QWidget {
 public:
   explicit LongitudinalPanel(QWidget *parent = nullptr);
   void showEvent(QShowEvent *event) override;
+  void hideEvent(QHideEvent *event) override;
   void refresh(bool _offroad);
 
 private: