1 files changed, 3 insertions, 3 deletions

diff --git a/apps/gui/list.c b/apps/gui/list.c
index 640a57fbd3..8ff075da7e 100644
--- a/apps/gui/list.c
+++ b/apps/gui/list.c
@@ -686,7 +686,7 @@ bool gui_synclist_do_button(struct gui_synclist * lists,
     switch (wrap)
     {
         case LIST_WRAP_ON:
-            gui_synclist_limit_scroll(lists, false);
+            gui_synclist_limit_scroll(lists, !global_settings.list_wraparound);
         break;
         case LIST_WRAP_OFF:
             gui_synclist_limit_scroll(lists, true);
@@ -697,7 +697,7 @@ bool gui_synclist_do_button(struct gui_synclist * lists,
                 action == ACTION_LISTTREE_PGUP  ||
                 action == ACTION_LISTTREE_PGDOWN)
                 gui_synclist_limit_scroll(lists, true);
-            else gui_synclist_limit_scroll(lists, false);
+            else gui_synclist_limit_scroll(lists, !global_settings.list_wraparound);
         break;
     };
 
@@ -911,7 +911,7 @@ bool simplelist_show_list(struct simplelist_info *info)
     struct gui_synclist lists;
     int action, old_line_count = simplelist_line_count;
     list_get_name *getname;
-    int wrap = LIST_WRAP_UNLESS_HELD;
+    int wrap = global_settings.list_wraparound ? LIST_WRAP_UNLESS_HELD : LIST_WRAP_OFF;
     if (info->get_name)
         getname = info->get_name;
     else