diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c
index 7edbbee38f..6dc2aed692 100644
--- a/menu/drivers/xmb.c
+++ b/menu/drivers/xmb.c
@@ -155,16 +155,17 @@ enum
 #ifdef HAVE_IMAGEVIEWER
    XMB_SYSTEM_TAB_IMAGES,
 #endif
-   XMB_SYSTEM_TAB_ADD,
 #ifdef HAVE_NETWORKING
-   XMB_SYSTEM_TAB_NETPLAY
+   XMB_SYSTEM_TAB_NETPLAY,
 #endif
+   XMB_SYSTEM_TAB_ADD
 };
 
-#ifdef HAVE_NETWORKING
-#define XMB_SYSTEM_TAB_END XMB_SYSTEM_TAB_NETPLAY
-#elif defined(HAVE_LIBRETRODB)
+
+#if defined(HAVE_LIBRETRODB)
 #define XMB_SYSTEM_TAB_END XMB_SYSTEM_TAB_ADD
+#elif defined(HAVE_NETWORKING)
+#define XMB_SYSTEM_TAB_END XMB_SYSTEM_TAB_NETPLAY
 #elif defined(HAVE_IMAGEVIEWER)
 #define XMB_SYSTEM_TAB_END XMB_SYSTEM_TAB_IMAGES
 #elif defined(HAVE_FFMPEG)
@@ -1499,12 +1500,12 @@ static xmb_node_t* xmb_get_node(xmb_handle_t *xmb, unsigned i)
 #endif
       case XMB_SYSTEM_TAB_HISTORY:
          return &xmb->history_tab_node;
-      case XMB_SYSTEM_TAB_ADD:
-         return &xmb->add_tab_node;
 #ifdef HAVE_NETWORKING
       case XMB_SYSTEM_TAB_NETPLAY:
          return &xmb->netplay_tab_node;
 #endif
+      case XMB_SYSTEM_TAB_ADD:
+         return &xmb->add_tab_node;
       default:
          if (i > xmb->system_tab_end)
             return xmb_get_userdata_from_horizontal_list(
@@ -3227,13 +3228,13 @@ static void *xmb_init(void **userdata)
    if (settings->menu.xmb.show_video)
       xmb->tabs[++xmb->system_tab_end] = XMB_SYSTEM_TAB_VIDEO;
 #endif
+#ifdef HAVE_NETWORKING
+   xmb->tabs[++xmb->system_tab_end]    = XMB_SYSTEM_TAB_NETPLAY;
+#endif
 #ifdef HAVE_LIBRETRODB
 	if (settings->menu.xmb.show_add)
       xmb->tabs[++xmb->system_tab_end] = XMB_SYSTEM_TAB_ADD;
 #endif
-#ifdef HAVE_NETWORKING
-   xmb->tabs[++xmb->system_tab_end]    = XMB_SYSTEM_TAB_NETPLAY;
-#endif
 
    menu_driver_ctl(RARCH_MENU_CTL_UNSET_PREVENT_POPULATE, NULL);
 
@@ -3817,12 +3818,6 @@ static void xmb_list_cache(void *data, enum menu_list_type type, unsigned action
                menu_stack->list[stack_size - 1].type =
                   MENU_HISTORY_TAB;
                break;
-            case XMB_SYSTEM_TAB_ADD:
-               menu_stack->list[stack_size - 1].label =
-                  strdup(msg_hash_to_str(MENU_ENUM_LABEL_ADD_TAB));
-               menu_stack->list[stack_size - 1].type =
-                  MENU_ADD_TAB;
-               break;
 #ifdef HAVE_NETWORKING
             case XMB_SYSTEM_TAB_NETPLAY:
                menu_stack->list[stack_size - 1].label =
@@ -3831,6 +3826,12 @@ static void xmb_list_cache(void *data, enum menu_list_type type, unsigned action
                   MENU_NETPLAY_TAB;
                break;
 #endif
+            case XMB_SYSTEM_TAB_ADD:
+               menu_stack->list[stack_size - 1].label =
+                  strdup(msg_hash_to_str(MENU_ENUM_LABEL_ADD_TAB));
+               menu_stack->list[stack_size - 1].type =
+                  MENU_ADD_TAB;
+               break;
             default:
                menu_stack->list[stack_size - 1].label =
                   strdup(msg_hash_to_str(MENU_ENUM_LABEL_HORIZONTAL_MENU));