diff --git a/apps/gui/list.c b/apps/gui/list.c
index c15b1beac1..23939469c5 100644
--- a/apps/gui/list.c
+++ b/apps/gui/list.c
@@ -186,6 +186,10 @@ static void gui_list_put_selection_in_screen(struct gui_list * gui_list,
             list_end = gui_list->nb_items;
         gui_list->start_item = list_end - nb_lines;
     }
+    else if (gui_list->nb_items-gui_list->selected_item < nb_lines)
+    {
+        gui_list->start_item = gui_list->nb_items - nb_lines;
+    }
     else
     {
         int list_start = gui_list->selected_item - SCROLL_LIMIT - 1;