diff --git a/apps/gui/option_select.c b/apps/gui/option_select.c
index 68103c77c3..d482bd24ae 100644
--- a/apps/gui/option_select.c
+++ b/apps/gui/option_select.c
@@ -39,7 +39,7 @@ void option_select_init_numeric(struct option_select * opt,
     opt->extra_string=unit;
     opt->formatter=formatter;
     opt->items=NULL;
-    opt->limit_loop=false;
+    opt->limit_loop=true;
 }
 
 void option_select_init_items(struct option_select * opt,
diff --git a/apps/gui/select.c b/apps/gui/select.c
index 12b3c91620..89a047890c 100644
--- a/apps/gui/select.c
+++ b/apps/gui/select.c
@@ -77,7 +77,6 @@ void gui_syncselect_draw(struct gui_select * select)
 
 bool gui_syncselect_do_button(struct gui_select * select, int button)
 {
-    select->options.limit_loop = false;
     switch(button)
     {
         case SELECT_INC | BUTTON_REPEAT :
diff --git a/apps/settings.c b/apps/settings.c
index 4bf098d1d1..d3441630fd 100644
--- a/apps/settings.c
+++ b/apps/settings.c
@@ -1585,6 +1585,7 @@ bool set_option(const char* string, void* variable, enum optiontype type,
     {
         gui_syncstatusbar_draw(&statusbars, true);
         button = button_get_w_tmo(HZ/2);
+        select.options.limit_loop = false;
         if(gui_syncselect_do_button(&select, button))
         {
             /* *variable = gui_select_get_selected(&select) */