diff --git a/radio/src/gui/navigation/navigation_9x.cpp b/radio/src/gui/navigation/navigation_9x.cpp
index 876ce6cf3..a58b03cb9 100644
--- a/radio/src/gui/navigation/navigation_9x.cpp
+++ b/radio/src/gui/navigation/navigation_9x.cpp
@@ -90,7 +90,7 @@ int checkIncDec(event_t event, int val, int i_min, int i_max, int srcMin, int sr
     }
 
     auto moved =  checkMovedInput(newval, i_min, i_max, i_flags, isSource);
-    if (isValueAvailable(moved))
+    if (!isValueAvailable || isValueAvailable(moved))
       newval = moved;
 
     if (invert) {
diff --git a/radio/src/gui/navigation/navigation_x7.cpp b/radio/src/gui/navigation/navigation_x7.cpp
index 448ac297f..72f0c1896 100644
--- a/radio/src/gui/navigation/navigation_x7.cpp
+++ b/radio/src/gui/navigation/navigation_x7.cpp
@@ -104,7 +104,7 @@ int checkIncDec(event_t event, int val, int i_min, int i_max, int srcMin, int sr
     }
 
     auto moved =  checkMovedInput(newval, i_min, i_max, i_flags, isSource);
-    if (isValueAvailable(moved))
+    if (!isValueAvailable || isValueAvailable(moved))
       newval = moved;
 
     if (invert) {