diff --git a/radio/src/thirdparty/libopenui/src/choice.h b/radio/src/thirdparty/libopenui/src/choice.h
index 3d3db203a..8a1ad7639 100644
--- a/radio/src/thirdparty/libopenui/src/choice.h
+++ b/radio/src/thirdparty/libopenui/src/choice.h
@@ -110,11 +110,11 @@ class Choice : public ChoiceBase {
 
       int value = vmin;
       while (index > 0) {
+        index--;
+        value++;
         while (value < vmax && !isValueAvailable(value)) {
           value++;
         }
-        value++;
-        index--;
       }
       return value;
     }