3 files changed, 14 insertions, 1 deletions

diff --git a/apps/menu.c b/apps/menu.c
index e483ad7136..68b9d0dbe7 100644
--- a/apps/menu.c
+++ b/apps/menu.c
@@ -166,7 +166,7 @@ void menu_draw(int m)
 #endif
     /* Adjust cursor pos if it's below the screen */
     if (menus[m].cursor - menus[m].top >= menu_lines)
-        menus[m].top++;
+        menus[m].top = menus[m].cursor - (menu_lines - 1);
 
     /* Adjust cursor pos if it's above the screen */
     if(menus[m].cursor < menus[m].top)
@@ -508,3 +508,13 @@ bool menu_movedown(int menu)
     
     return true;
 }
+
+/*
+ * Allows to set the cursor position. Doesn't redraw by itself.
+ */
+
+void menu_set_cursor(int menu, int position)
+{
+    menus[menu].cursor = position;
+}
+
diff --git a/apps/menu.h b/apps/menu.h
index 1171f0efc5..046153b654 100644
--- a/apps/menu.h
+++ b/apps/menu.h
@@ -90,5 +90,6 @@ bool menu_moveup(int menu);
 bool menu_movedown(int menu);
 void menu_draw(int menu);
 void menu_insert(int menu, int position, char *desc, bool (*function) (void));
+void menu_set_cursor(int menu, int position);
 
 #endif /* End __MENU_H__ */
diff --git a/apps/recorder/radio.c b/apps/recorder/radio.c
index 10a513f01f..59dd9dc37f 100644
--- a/apps/recorder/radio.c
+++ b/apps/recorder/radio.c
@@ -817,6 +817,8 @@ bool handle_radio_presets(void)
                                  str(LANG_FM_BUTTONBAR_ADD),
                                  str(LANG_FM_BUTTONBAR_EXIT),
                                  str(LANG_FM_BUTTONBAR_ACTION));
+        if (curr_preset >= 0)
+            menu_set_cursor(preset_menu, curr_preset);
         result = menu_show(preset_menu);
         menu_exit(preset_menu);
         if (result == MENU_SELECTED_EXIT)