diff --git a/radio/src/gui/128x64/model_logical_switches.cpp b/radio/src/gui/128x64/model_logical_switches.cpp
index 4645fe937..829f9a944 100644
--- a/radio/src/gui/128x64/model_logical_switches.cpp
+++ b/radio/src/gui/128x64/model_logical_switches.cpp
@@ -225,6 +225,7 @@ void onLogicalSwitchesMenu(const char *result)
   LogicalSwitchData * cs = lswAddress(sub);
 
   if (result == STR_EDIT) {
+    s_currIdx = sub;
     pushMenu(menuModelLogicalSwitchOne);
   }