diff --git a/apps/gui/list.c b/apps/gui/list.c
index 9b4211cd48..da79a69a0f 100644
--- a/apps/gui/list.c
+++ b/apps/gui/list.c
@@ -525,9 +525,11 @@ static void gui_list_select_at_offset(struct gui_list * gui_list, int offset)
             }
             else
             {
-                gui_list->selected_item = gui_list->nb_items - 1;
+                gui_list->selected_item = gui_list->nb_items - 
+                                            gui_list->selected_size;
                 if (gui_list->nb_items >= nb_lines )
-                    gui_list->start_item = gui_list->selected_item - nb_lines + 1;
+                    gui_list->start_item = gui_list->selected_item - 
+                                            nb_lines + gui_list->selected_size;
             }
             return;
         }