diff --git a/src/displays/menus/aboutmenu.h b/src/displays/menus/aboutmenu.h
index cb1c64b..a88a17b 100644
--- a/src/displays/menus/aboutmenu.h
+++ b/src/displays/menus/aboutmenu.h
@@ -20,6 +20,7 @@ constexpr char TEXT_ESPINFO[] = "ESP info:";
 class AboutMenu :
     public MenuDisplay,
     public StaticText<TEXT_ABOUT>,
+    public BackActionInterface<SwitchScreenAction<SettingsMenu>>,
     public StaticMenuDefinition<
         makeComponent<MenuItem, StaticText<TEXT_VERSION>, DummyAction>,
         makeComponent<MenuItem, StaticText<nullptr>, DummyAction>,
diff --git a/src/displays/menus/accesspointwifisettingsmenu.h b/src/displays/menus/accesspointwifisettingsmenu.h
index 5b75b12..183f322 100644
--- a/src/displays/menus/accesspointwifisettingsmenu.h
+++ b/src/displays/menus/accesspointwifisettingsmenu.h
@@ -50,6 +50,7 @@ public:
 class AccessPointWifiSettingsMenu :
     public MenuDisplay,
     public StaticText<TEXT_ACCESSPOINTWIFISETTINGS>,
+    public BackActionInterface<SwitchScreenAction<WifiSettingsMenu>>,
     public StaticMenuDefinition<
         makeComponent<MenuItem, WifiSoftApGetStationNumText,           StaticFont<2>, DisabledColor, DummyAction>,
         makeComponent<MenuItem, WifiSoftApIpText,                      StaticFont<2>, DisabledColor, DummyAction>,
diff --git a/src/displays/menus/bluetoothsettingsmenu.h b/src/displays/menus/bluetoothsettingsmenu.h
index 00f3e6c..af0afdb 100644
--- a/src/displays/menus/bluetoothsettingsmenu.h
+++ b/src/displays/menus/bluetoothsettingsmenu.h
@@ -22,6 +22,7 @@ namespace {
 class BluetoothSettingsMenu :
     public MenuDisplay,
     public StaticText<TEXT_BLUETOOTHSETTINGS>,
+    public BackActionInterface<SwitchScreenAction<SettingsMenu>>,
     public StaticMenuDefinition<
         makeComponent<MenuItem, BluetoothAvailableText,                 DisabledColor, DummyAction>,
         makeComponent<MenuItem, BluetoothHasClientText,                 DisabledColor, DummyAction>,
diff --git a/src/displays/menus/boardcomputerhardwaresettingsmenu.h b/src/displays/menus/boardcomputerhardwaresettingsmenu.h
index 79548b7..a83e1b7 100644
--- a/src/displays/menus/boardcomputerhardwaresettingsmenu.h
+++ b/src/displays/menus/boardcomputerhardwaresettingsmenu.h
@@ -37,6 +37,7 @@ using BremsMaxChangeScreen = makeComponent<ChangeValueDisplay<int16_t>, StaticTe
 class BoardcomputerHardwareSettingsMenu :
     public MenuDisplay,
     public StaticText<TEXT_BOARDCOMPUTERHARDWARESETTINGS>,
+    public BackActionInterface<SwitchScreenAction<SettingsMenu>>,
     public StaticMenuDefinition<
         makeComponent<MenuItem, GasText,                         DisabledColor, StaticFont<2>, DummyAction>,
         makeComponent<MenuItem, BremsText,                       DisabledColor, StaticFont<2>, DummyAction>,
diff --git a/src/displays/menus/buzzermenu.h b/src/displays/menus/buzzermenu.h
index 810978f..5487708 100644
--- a/src/displays/menus/buzzermenu.h
+++ b/src/displays/menus/buzzermenu.h
@@ -39,6 +39,7 @@ using ReverseBeepDuration1ChangeScreen = makeComponent<ChangeValueDisplay<int16_
 class BuzzerMenu :
     public MenuDisplay,
     public StaticText<TEXT_BUZZER>,
+    public BackActionInterface<SwitchScreenAction<SettingsMenu>>,
     public StaticMenuDefinition<
         makeComponent<MenuItem, StaticText<TEXT_FRONTFREQ>,            SwitchScreenAction<FrontFreqChangeScreen>>,
         makeComponent<MenuItem, StaticText<TEXT_FRONTPATTERN>,         SwitchScreenAction<FrontPatternChangeScreen>>,
diff --git a/src/displays/menus/commanddebugmenu.h b/src/displays/menus/commanddebugmenu.h
index 0861d1a..6e8a6b1 100644
--- a/src/displays/menus/commanddebugmenu.h
+++ b/src/displays/menus/commanddebugmenu.h
@@ -19,6 +19,7 @@ template<const char *Ttext, typename Ttexts>
 class CommandDebugMenu :
     public MenuDisplay,
     public StaticText<Ttext>,
+    public BackActionInterface<SwitchScreenAction<DebugMenu>>,
     public StaticMenuDefinition<
         makeComponent<MenuItem, typename Ttexts::BuzzerFreqText,    DisabledColor, DummyAction>,
         makeComponent<MenuItem, typename Ttexts::BuzzerPatternText, DisabledColor, DummyAction>,
diff --git a/src/displays/menus/controllerhardwaresettingsmenu.h b/src/displays/menus/controllerhardwaresettingsmenu.h
index 599a359..7fffb3e 100644
--- a/src/displays/menus/controllerhardwaresettingsmenu.h
+++ b/src/displays/menus/controllerhardwaresettingsmenu.h
@@ -30,6 +30,7 @@ using NumMagnetPolesChangeScreen = makeComponent<ChangeValueDisplay<int16_t>, St
 class ControllerHardwareSettingsMenu :
     public MenuDisplay,
     public StaticText<TEXT_CONTROLLERHARDWARESETTINGS>,
+    public BackActionInterface<SwitchScreenAction<SettingsMenu>>,
     public StaticMenuDefinition<
         makeComponent<MenuItem, StaticText<TEXT_SETENABLED>,        SwitchScreenAction<EnableMenu>>,
         makeComponent<MenuItem, StaticText<TEXT_SETINVERTED>,       SwitchScreenAction<InvertMenu>>,
diff --git a/src/displays/menus/defaultmodesettingsmenu.h b/src/displays/menus/defaultmodesettingsmenu.h
index 3f53c93..e5a450a 100644
--- a/src/displays/menus/defaultmodesettingsmenu.h
+++ b/src/displays/menus/defaultmodesettingsmenu.h
@@ -32,6 +32,7 @@ using DefaultModeBrems2WertChangeDisplay = makeComponent<ChangeValueDisplay<int1
 class DefaultModeSettingsMenu :
     public MenuDisplay,
     public StaticText<TEXT_DEFAULTMODESETTIGNS>,
+    public BackActionInterface<SwitchScreenAction<ModesSettingsMenu>>,
     public StaticMenuDefinition<
         makeComponent<MenuItem, StaticText<TEXT_SETCONTROLTYPE>,     SwitchScreenAction<DefaultModeCtrlTypChangeDisplay>>,
         makeComponent<MenuItem, StaticText<TEXT_SETCONTROLMODE>,     SwitchScreenAction<DefaultModeCtrlModChangeDisplay>>,
diff --git a/src/displays/menus/dynamicdebugmenu.h b/src/displays/menus/dynamicdebugmenu.h
index 1311776..2013c29 100644
--- a/src/displays/menus/dynamicdebugmenu.h
+++ b/src/displays/menus/dynamicdebugmenu.h
@@ -121,6 +121,7 @@ constexpr char TEXT_DEBUGTOGGLE[] = "Toggle";
 class DynamicDebugMenu :
     public MenuDisplay,
     public RandomText,
+    public BackActionInterface<SwitchScreenAction<DebugMenu>>,
     public StaticMenuDefinition<
         // dummy items to allow for scrolling
         makeComponent<MenuItem, StaticText<TEXT_DUMMYITEM>,    DummyAction>,
diff --git a/src/displays/menus/enablemenu.h b/src/displays/menus/enablemenu.h
index 82504da..583ee3e 100644
--- a/src/displays/menus/enablemenu.h
+++ b/src/displays/menus/enablemenu.h
@@ -19,6 +19,7 @@ namespace {
 class EnableMenu :
     public MenuDisplay,
     public StaticText<TEXT_SETENABLED>,
+    public BackActionInterface<SwitchScreenAction<ControllerHardwareSettingsMenu>>,
     public StaticMenuDefinition<
         makeComponent<MenuItem, StaticText<TEXT_ENABLEFRONTLEFT>,  ToggleBoolAction, CheckboxIcon, FrontLeftEnabledAccessor>,
         makeComponent<MenuItem, StaticText<TEXT_ENABLEFRONTRIGHT>, ToggleBoolAction, CheckboxIcon, FrontRightEnabledAccessor>,
diff --git a/src/displays/menus/feedbackdebugmenu.h b/src/displays/menus/feedbackdebugmenu.h
index ae5af02..0e40c27 100644
--- a/src/displays/menus/feedbackdebugmenu.h
+++ b/src/displays/menus/feedbackdebugmenu.h
@@ -20,6 +20,7 @@ template<const char *Ttext, typename Ttexts, template<int> class ColorInterface>
 class FeedbackDebugMenu :
     public MenuDisplay,
     public StaticText<Ttext>,
+    public BackActionInterface<SwitchScreenAction<DebugMenu>>,
     public StaticMenuDefinition<
         makeComponent<MenuItem, typename Ttexts::BatVoltageText,       ColorInterface<TFT_DARKGREY>, DummyAction>,
         makeComponent<MenuItem, typename Ttexts::BatVoltageFixedText,  ColorInterface<TFT_DARKGREY>, DummyAction>,
diff --git a/src/displays/menus/genericwifisettingsmenu.h b/src/displays/menus/genericwifisettingsmenu.h
index b9cabb1..b8c6cf1 100644
--- a/src/displays/menus/genericwifisettingsmenu.h
+++ b/src/displays/menus/genericwifisettingsmenu.h
@@ -67,6 +67,7 @@ using WifiTxPowerChangeScreen = makeComponent<ChangeValueDisplay<wifi_power_t>,
 class GenericWifiSettingsMenu :
     public MenuDisplay,
     public StaticText<TEXT_GENERICWIFISETTINGS>,
+    public BackActionInterface<SwitchScreenAction<WifiSettingsMenu>>,
     public StaticMenuDefinition<
         makeComponent<MenuItem, WifiStatusBitsText,                 DisabledColor, DummyAction>,
         makeComponent<MenuItem, WifiChannelText,                    DisabledColor, DummyAction>,
diff --git a/src/displays/menus/invertmenu.h b/src/displays/menus/invertmenu.h
index 286f204..4031426 100644
--- a/src/displays/menus/invertmenu.h
+++ b/src/displays/menus/invertmenu.h
@@ -19,6 +19,7 @@ namespace {
 class InvertMenu :
     public MenuDisplay,
     public StaticText<TEXT_SETINVERTED>,
+    public BackActionInterface<SwitchScreenAction<ControllerHardwareSettingsMenu>>,
     public StaticMenuDefinition<
         makeComponent<MenuItem, StaticText<TEXT_INVERTFRONTLEFT>,  ToggleBoolAction, CheckboxIcon, FrontLeftInvertedAccessor>,
         makeComponent<MenuItem, StaticText<TEXT_INVERTFRONTRIGHT>, ToggleBoolAction, CheckboxIcon, FrontRightInvertedAccessor>,
diff --git a/src/displays/menus/larsmmodesettingsmenu.h b/src/displays/menus/larsmmodesettingsmenu.h
index 5712dee..a9c1929 100644
--- a/src/displays/menus/larsmmodesettingsmenu.h
+++ b/src/displays/menus/larsmmodesettingsmenu.h
@@ -22,6 +22,7 @@ using LarsmModeIterationsChangeDisplay = makeComponent<ChangeValueDisplay<uint8_
 class LarsmModeSettingsMenu :
     public MenuDisplay,
     public StaticText<TEXT_LARSMMODESETTINGS>,
+    public BackActionInterface<SwitchScreenAction<ModesSettingsMenu>>,
     public StaticMenuDefinition<
         makeComponent<MenuItem, StaticText<TEXT_LARSMMODECHANGEMODE>,       SwitchScreenAction<LarsmModeModeChangeDisplay>>,
         makeComponent<MenuItem, StaticText<TEXT_LARSMMODECHANGEITERATIONS>, SwitchScreenAction<LarsmModeIterationsChangeDisplay>>,
diff --git a/src/displays/menus/limitssettingsmenu.h b/src/displays/menus/limitssettingsmenu.h
index 5e61243..e7cc226 100644
--- a/src/displays/menus/limitssettingsmenu.h
+++ b/src/displays/menus/limitssettingsmenu.h
@@ -26,6 +26,7 @@ using PhaseAdvMaxChangeScreen = makeComponent<ChangeValueDisplay<int16_t>, Stati
 class LimitsSettingsMenu :
     public MenuDisplay,
     public StaticText<TEXT_LIMITSSETTINGS>,
+    public BackActionInterface<SwitchScreenAction<SettingsMenu>>,
     public StaticMenuDefinition<
         makeComponent<MenuItem, StaticText<TEXT_SETIMOTMAX>,      SwitchScreenAction<IMotMaxChangeScreen>>,
         makeComponent<MenuItem, StaticText<TEXT_SETIDCMAX>,       SwitchScreenAction<IDcMaxChangeScreen>>,
diff --git a/src/displays/menus/modessettingsmenu.h b/src/displays/menus/modessettingsmenu.h
index c542c0f..b5dd684 100644
--- a/src/displays/menus/modessettingsmenu.h
+++ b/src/displays/menus/modessettingsmenu.h
@@ -18,6 +18,7 @@ namespace {
 class ModesSettingsMenu :
     public MenuDisplay,
     public StaticText<TEXT_MODESSETTINGS>,
+    public BackActionInterface<SwitchScreenAction<SettingsMenu>>,
     public StaticMenuDefinition<
         makeComponent<MenuItem, StaticText<TEXT_DEFAULTMODESETTIGNS>,   SwitchScreenAction<DefaultModeSettingsMenu>>,
         makeComponent<MenuItem, StaticText<TEXT_TEMPOMATMODESETTINGS>,  SwitchScreenAction<TempomatModeSettingsMenu>>,
diff --git a/src/displays/menus/motorfeedbackdebugmenu.h b/src/displays/menus/motorfeedbackdebugmenu.h
index 5f78b11..cf01dd2 100644
--- a/src/displays/menus/motorfeedbackdebugmenu.h
+++ b/src/displays/menus/motorfeedbackdebugmenu.h
@@ -20,6 +20,7 @@ template<const char *Ttext, typename Ttexts, template<int> class ColorInterface>
 class MotorFeedbackDebugMenu :
     public MenuDisplay,
     public StaticText<Ttext>,
+    public BackActionInterface<SwitchScreenAction<DebugMenu>>,
     public StaticMenuDefinition<
         makeComponent<MenuItem, typename Ttexts::AngleText,        ColorInterface<TFT_DARKGREY>, DummyAction>,
         makeComponent<MenuItem, typename Ttexts::SpeedText,        ColorInterface<TFT_DARKGREY>, DummyAction>,
diff --git a/src/displays/menus/motorstatedebugmenu.h b/src/displays/menus/motorstatedebugmenu.h
index 951ebfc..ce29146 100644
--- a/src/displays/menus/motorstatedebugmenu.h
+++ b/src/displays/menus/motorstatedebugmenu.h
@@ -19,6 +19,7 @@ template<const char *Ttext, typename Ttexts>
 class MotorStateDebugMenu :
     public MenuDisplay,
     public StaticText<Ttext>,
+    public BackActionInterface<SwitchScreenAction<DebugMenu>>,
     public StaticMenuDefinition<
         makeComponent<MenuItem, typename Ttexts::EnableText,       DisabledColor, DummyAction>,
         makeComponent<MenuItem, typename Ttexts::PwmText,          DisabledColor, DummyAction>,
diff --git a/src/displays/menus/stationwifisettingsmenu.h b/src/displays/menus/stationwifisettingsmenu.h
index 3b5aa16..a570d60 100644
--- a/src/displays/menus/stationwifisettingsmenu.h
+++ b/src/displays/menus/stationwifisettingsmenu.h
@@ -112,6 +112,7 @@ public:
 class StationWifiSettingsMenu :
     public MenuDisplay,
     public StaticText<TEXT_STATIONWIFISETTINGS>,
+    public BackActionInterface<SwitchScreenAction<WifiSettingsMenu>>,
     public StaticMenuDefinition<
         makeComponent<MenuItem, StaticText<TEXT_WIFIRECONNECT>,           WifiReconnectAction>,
         makeComponent<MenuItem, StaticText<TEXT_WIFIDISCONNECT>,          WifiDisconnectAction>,
diff --git a/src/displays/menus/tempomatmodesettingsmenu.h b/src/displays/menus/tempomatmodesettingsmenu.h
index bae2ccb..09aabb7 100644
--- a/src/displays/menus/tempomatmodesettingsmenu.h
+++ b/src/displays/menus/tempomatmodesettingsmenu.h
@@ -22,6 +22,7 @@ using TempomatModeCtrlModChangeScreen = makeComponent<ChangeValueDisplay<Control
 class TempomatModeSettingsMenu :
     public MenuDisplay,
     public StaticText<TEXT_TEMPOMATMODESETTINGS>,
+    public BackActionInterface<SwitchScreenAction<ModesSettingsMenu>>,
     public StaticMenuDefinition<
         makeComponent<MenuItem, StaticText<TEXT_SETCONTROLTYPE>, SwitchScreenAction<TempomatModeCtrlTypChangeScreen>>,
         makeComponent<MenuItem, StaticText<TEXT_SETCONTROLMODE>, SwitchScreenAction<TempomatModeCtrlModChangeScreen>>,
diff --git a/src/displays/menus/wifiscanmenu.h b/src/displays/menus/wifiscanmenu.h
index 18d0c5e..9a151c8 100644
--- a/src/displays/menus/wifiscanmenu.h
+++ b/src/displays/menus/wifiscanmenu.h
@@ -18,7 +18,7 @@ class WifiSettingsMenu;
 }
 
 namespace {
-class WifiScanMenu : public MenuDisplay
+class WifiScanMenu : public MenuDisplay, public BackActionInterface<SwitchScreenAction<WifiSettingsMenu>>
 {
     using Base = MenuDisplay;
 
diff --git a/src/displays/menus/wifisettingsmenu.h b/src/displays/menus/wifisettingsmenu.h
index b9452b5..717c0b1 100644
--- a/src/displays/menus/wifisettingsmenu.h
+++ b/src/displays/menus/wifisettingsmenu.h
@@ -20,6 +20,7 @@ namespace {
 class WifiSettingsMenu :
     public MenuDisplay,
     public StaticText<TEXT_WIFISETTINGS>,
+    public BackActionInterface<SwitchScreenAction<SettingsMenu>>,
     public StaticMenuDefinition<
         makeComponent<MenuItem, StaticText<TEXT_GENERICWIFISETTINGS>,     SwitchScreenAction<GenericWifiSettingsMenu>>,
         makeComponent<MenuItem, StaticText<TEXT_STATIONWIFISETTINGS>,     SwitchScreenAction<StationWifiSettingsMenu>>,