diff --git a/radio/src/gui/menus.cpp b/radio/src/gui/menus.cpp
index 7132bb470..088765c47 100644
--- a/radio/src/gui/menus.cpp
+++ b/radio/src/gui/menus.cpp
@@ -135,10 +135,9 @@ int8_t checkIncDecMovedSwitch(int8_t val)
 int8_t  checkIncDec_Ret;
 
 #if defined(CPUARM)
-const int _stops100[] = { 3, -100, 0, 100 };
-const CheckIncDecStops &stops100  = (const CheckIncDecStops&)_stops100;
-const int _stops1000[] = { 3, -1000, 0, 1000 };
-const CheckIncDecStops &stops1000 = (const CheckIncDecStops&)_stops1000;
+INIT_STOPS(stops100, 3, -100, 0, 100)
+INIT_STOPS(stops1000, 3, -1000, 0, 1000)
+INIT_STOPS(stopsSwitch, 13, CATEGORY_END(-SWSRC_FIRST_LOGICAL_SWITCH), CATEGORY_END(-SWSRC_FIRST_TRIM), CATEGORY_END(-SWSRC_LAST_SWITCH+1), 0, CATEGORY_END(SWSRC_LAST_SWITCH), CATEGORY_END(SWSRC_FIRST_TRIM-1), CATEGORY_END(SWSRC_FIRST_LOGICAL_SWITCH-1))
 
 int checkIncDec(unsigned int event, int val, int i_min, int i_max, unsigned int i_flags, IsValueAvailable isValueAvailable, const CheckIncDecStops &stops)
 {
@@ -280,11 +279,14 @@ int checkIncDec(unsigned int event, int val, int i_min, int i_max, unsigned int
 
   if (newval != val) {
     if (!(i_flags & NO_INCDEC_MARKS) && (newval != i_max) && (newval != i_min) && stops.contains(newval) && !IS_ROTARY_EVENT(event)) {
-      pauseEvents(event); // delay before auto-repeat continues
-      if (newval>val) // without AUDIO it's optimized, because the 2 sounds are the same
-        AUDIO_KEYPAD_UP();
-      else
-        AUDIO_KEYPAD_DOWN();
+      bool pause = (newval > val ? !stops.contains(newval-1) : !stops.contains(newval+1));
+      if (pause) {
+        pauseEvents(event); // delay before auto-repeat continues
+        if (newval>val) // without AUDIO it's optimized, because the 2 sounds are the same
+          AUDIO_KEYPAD_UP();
+        else
+          AUDIO_KEYPAD_DOWN();
+      }
     }
     eeDirty(i_flags & (EE_GENERAL|EE_MODEL));
     checkIncDec_Ret = (newval > val ? 1 : -1);
diff --git a/radio/src/gui/menus.h b/radio/src/gui/menus.h
index 9f84472fd..5b4e11b75 100644
--- a/radio/src/gui/menus.h
+++ b/radio/src/gui/menus.h
@@ -208,14 +208,23 @@ struct CheckIncDecStops {
   bool contains(int value) const
   {
     for (int i=0; i<count; ++i) {
-      if (value == stops[i])
+      int stop = stops[i];
+      if (value == stop)
         return true;
+      else if (value < stop)
+        return false;
     }
     return false;
   }
 };
 extern const CheckIncDecStops &stops100;
 extern const CheckIncDecStops &stops1000;
+extern const CheckIncDecStops &stopsSwitch;
+#define INIT_STOPS(var, ...)                                        \
+  const int _ ## var[] = { __VA_ARGS__ };                           \
+  const CheckIncDecStops &var  = (const CheckIncDecStops&)_ ## var;
+#define CATEGORY_END(val)                                          \
+  (val), (val+1)
 int checkIncDec(unsigned int event, int val, int i_min, int i_max, unsigned int i_flags=0, IsValueAvailable isValueAvailable=NULL, const CheckIncDecStops &stops=stops100);
 #else
 int16_t checkIncDec(uint8_t event, int16_t i_pval, int16_t i_min, int16_t i_max, uint8_t i_flags=0);
@@ -262,7 +271,7 @@ int8_t checkIncDecGen(uint8_t event, int8_t i_val, int8_t i_min, int8_t i_max);
   bool isModuleAvailable(int module);
   #define AUTOSWITCH_ENTER_LONG() (attr && event==EVT_KEY_LONG(KEY_ENTER))
   #define CHECK_INCDEC_SWITCH(event, var, min, max, flags, available) \
-    var = checkIncDec(event, var, min, max, (flags)|INCDEC_SWITCH|NO_INCDEC_MARKS, available)
+    var = checkIncDec(event, var, min, max, (flags)|INCDEC_SWITCH, available)
   #define CHECK_INCDEC_MODELSWITCH(event, var, min, max, available) \
     CHECK_INCDEC_SWITCH(event, var, min, max, EE_MODEL, available)
 #elif defined(AUTOSWITCH)