diff --git a/apps/gui/list.c b/apps/gui/list.c
index fbb7508779..5ae400e24a 100644
--- a/apps/gui/list.c
+++ b/apps/gui/list.c
@@ -499,7 +499,7 @@ static void gui_list_put_selection_on_screen(struct gui_synclist * gui_list,
         if (global_settings.scroll_paginated)
         {
             if (gui_list->start_item[screen] > gui_list->selected_item)
-                gui_list->start_item[screen] = MAX(0, gui_list->start_item[screen] - nb_lines);
+                gui_list->start_item[screen] = (gui_list->selected_item/nb_lines)*nb_lines;
         }
         else
         {
diff --git a/docs/CREDITS b/docs/CREDITS
index b41acad3fc..5d2ae58fdf 100644
--- a/docs/CREDITS
+++ b/docs/CREDITS
@@ -360,6 +360,7 @@ Robert Menes
 Henri Valta
 Melba Sitjar
 Mehmet Ş. Çatalbaş
+Scott Tinman
 
 The libmad team
 The wavpack team