diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h
index 6754c7e2de..94830f7b12 100644
--- a/intl/msg_hash_us.h
+++ b/intl/msg_hash_us.h
@@ -2655,3 +2655,7 @@ MSG_HASH(
       MENU_ENUM_SUBLABEL_BATTERY_LEVEL_ENABLE,
       "Shows current battery level inside the menu."
       )
+MSG_HASH(
+      MENU_ENUM_SUBLABEL_NAVIGATION_WRAPAROUND,
+      "Wrap-around to beginning and/or end if boundary of list is reached horizontally or vertically."
+      )
diff --git a/menu/cbs/menu_cbs_sublabel.c b/menu/cbs/menu_cbs_sublabel.c
index 2e514c2344..bae21fd39e 100644
--- a/menu/cbs/menu_cbs_sublabel.c
+++ b/menu/cbs/menu_cbs_sublabel.c
@@ -197,6 +197,7 @@ default_sublabel_macro(action_bind_sublabel_pointer_enable,                MENU_
 default_sublabel_macro(action_bind_sublabel_thumbnails,                    MENU_ENUM_SUBLABEL_THUMBNAILS)
 default_sublabel_macro(action_bind_sublabel_timedate_enable,               MENU_ENUM_SUBLABEL_TIMEDATE_ENABLE)
 default_sublabel_macro(action_bind_sublabel_battery_level_enable,          MENU_ENUM_SUBLABEL_BATTERY_LEVEL_ENABLE)
+default_sublabel_macro(action_bind_sublabel_navigation_wraparound,         MENU_ENUM_SUBLABEL_NAVIGATION_WRAPAROUND)
 
 static int action_bind_sublabel_cheevos_entry(
       file_list_t *list,
@@ -258,6 +259,9 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs,
    {
       switch (cbs->enum_idx)
       {
+         case MENU_ENUM_LABEL_NAVIGATION_WRAPAROUND:
+            BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_navigation_wraparound); 
+            break;
          case MENU_ENUM_LABEL_BATTERY_LEVEL_ENABLE:
             BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_battery_level_enable); 
             break;
diff --git a/retroarch.cfg b/retroarch.cfg
index c7f728b79b..2601c908fe 100644
--- a/retroarch.cfg
+++ b/retroarch.cfg
@@ -664,10 +664,10 @@
 # Type of thumbnail to display. 0 = none, 1 = snaps, 2 = titles, 3 = boxarts
 # menu_thumbnails = 0
 
-# Wrap-around to beginning and/or end if boundary of list is reached horizontally or vertically
+# Wrap-around to beginning and/or end if boundary of list is reached horizontally or vertically.
 # menu_navigation_wraparound_enable = false
 
-# Filter files being shown in filebrowser by supported extensions
+# Filter files being shown in filebrowser by supported extensions.
 # menu_navigation_browser_filter_supported_extensions_enable = true
 
 # Collapse subgroup settings into main group to create one big listing of settings