diff --git a/menu/drivers/glui.c b/menu/drivers/glui.c
index d91b5ab629..310a1dd28d 100644
--- a/menu/drivers/glui.c
+++ b/menu/drivers/glui.c
@@ -564,5 +564,6 @@ menu_ctx_driver_t menu_ctx_glui = {
    NULL,
    NULL,
    glui_entry_iterate,
+   NULL,
    "glui",
 };
diff --git a/menu/drivers/ios.c b/menu/drivers/ios.c
index 4f15356e21..29a14202c4 100644
--- a/menu/drivers/ios.c
+++ b/menu/drivers/ios.c
@@ -90,5 +90,6 @@ menu_ctx_driver_t menu_ctx_ios = {
   NULL, // list_cache
   NULL, // list_set_selection
   ios_entry_iterate,
+  NULL,
   "ios",
 };
diff --git a/menu/drivers/rgui.c b/menu/drivers/rgui.c
index 4dce438936..31a95819f7 100644
--- a/menu/drivers/rgui.c
+++ b/menu/drivers/rgui.c
@@ -597,5 +597,6 @@ menu_ctx_driver_t menu_ctx_rgui = {
    NULL,
    NULL,
    rgui_entry_iterate,
+   NULL,
    "rgui",
 };
diff --git a/menu/drivers/rmenu.c b/menu/drivers/rmenu.c
index 17cae8b30f..ee27258954 100644
--- a/menu/drivers/rmenu.c
+++ b/menu/drivers/rmenu.c
@@ -385,5 +385,6 @@ menu_ctx_driver_t menu_ctx_rmenu = {
    NULL,
    NULL,
    rmenu_entry_iterate,
+   NULL,
    "rmenu",
 };
diff --git a/menu/drivers/rmenu_xui.cpp b/menu/drivers/rmenu_xui.cpp
index 1e368e086d..e71129ca29 100644
--- a/menu/drivers/rmenu_xui.cpp
+++ b/menu/drivers/rmenu_xui.cpp
@@ -700,5 +700,6 @@ menu_ctx_driver_t menu_ctx_rmenu_xui = {
    NULL,
    rmenu_xui_list_set_selection,
    rmenu_xui_entry_iterate,
+   NULL,
    "rmenu_xui",
 };
diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c
index 19f1d0b10e..bb7b61d4f9 100644
--- a/menu/drivers/xmb.c
+++ b/menu/drivers/xmb.c
@@ -52,8 +52,7 @@ typedef struct
 
 enum
 {
-   XMB_TEXTURE_BG = 0,
-   XMB_TEXTURE_SETTINGS,
+   XMB_TEXTURE_SETTINGS = 0,
    XMB_TEXTURE_SETTING,
    XMB_TEXTURE_SUBSETTING,
    XMB_TEXTURE_ARROW,
@@ -129,6 +128,7 @@ typedef struct xmb_handle
          float alpha;
       } arrow;
 
+      struct xmb_texture_item bg;
       struct xmb_texture_item list[XMB_TEXTURE_LAST];
    } textures;
 
@@ -426,10 +426,10 @@ static void xmb_render_background(gl_t *gl, xmb_handle_t *xmb,
    if ((g_settings.menu.pause_libretro
       || !g_extern.main_is_init || g_extern.libretro_dummy)
       && !force_transparency
-      && xmb->textures.list[XMB_TEXTURE_BG].id)
+      && xmb->textures.bg.id)
    {
       coords.color = color;
-      glBindTexture(GL_TEXTURE_2D, xmb->textures.list[XMB_TEXTURE_BG].id);
+      glBindTexture(GL_TEXTURE_2D, xmb->textures.bg.id);
    }
    else
    {
@@ -1284,6 +1284,31 @@ static bool xmb_font_init_first(const gl_font_renderer_t **font_driver,
          font_path, xmb_font_size);
 }
 
+static bool xmb_load_background(menu_handle_t *menu, const char *path)
+{
+   xmb_handle_t *xmb = NULL;
+
+   if (!menu)
+      return false;
+   
+   xmb = (xmb_handle_t*)menu->userdata;
+
+   if (!xmb)
+      return false;
+   if (!path)
+      return false;
+
+   if (xmb->textures.bg.id)
+      glDeleteTextures(1, &xmb->textures.bg.id);
+
+   strlcpy(xmb->textures.bg.path, path, sizeof(xmb->textures.bg.path));
+
+   xmb->textures.bg.id   = menu_texture_load(xmb->textures.bg.path,
+         TEXTURE_BACKEND_OPENGL, TEXTURE_FILTER_MIPMAP_LINEAR);
+
+   return true;
+}
+
 static void xmb_context_reset(menu_handle_t *menu)
 {
    int i, k;
@@ -1325,11 +1350,11 @@ static void xmb_context_reset(menu_handle_t *menu)
    xmb_font_init_first(&gl->font_driver, &xmb->font.buf, gl, fontpath, xmb->font.size);
 
    if (*g_settings.menu.wallpaper)
-      strlcpy(xmb->textures.list[XMB_TEXTURE_BG].path, g_settings.menu.wallpaper,
-            sizeof(xmb->textures.list[XMB_TEXTURE_BG].path));
+      strlcpy(xmb->textures.bg.path, g_settings.menu.wallpaper,
+            sizeof(xmb->textures.bg.path));
    else
-      fill_pathname_join(xmb->textures.list[XMB_TEXTURE_BG].path, iconpath,
-            "bg.png", sizeof(xmb->textures.list[XMB_TEXTURE_BG].path));
+      fill_pathname_join(xmb->textures.bg.path, iconpath,
+            "bg.png", sizeof(xmb->textures.bg.path));
    fill_pathname_join(xmb->textures.list[XMB_TEXTURE_SETTINGS].path, iconpath,
          "settings.png", sizeof(xmb->textures.list[XMB_TEXTURE_SETTINGS].path));
    fill_pathname_join(xmb->textures.list[XMB_TEXTURE_SETTING].path, iconpath,
@@ -1373,6 +1398,8 @@ static void xmb_context_reset(menu_handle_t *menu)
       xmb->textures.list[k].id   = menu_texture_load(xmb->textures.list[k].path,
             TEXTURE_BACKEND_OPENGL, TEXTURE_FILTER_MIPMAP_LINEAR);
 
+   xmb_load_background(driver.menu, xmb->textures.bg.path);
+
    xmb->settings_node.icon  = xmb->textures.list[XMB_TEXTURE_SETTINGS].id;
    xmb->settings_node.alpha = xmb->categories.active.alpha;
    xmb->settings_node.zoom  = xmb->categories.active.zoom;
@@ -1665,5 +1692,6 @@ menu_ctx_driver_t menu_ctx_xmb = {
    xmb_list_cache,
    NULL,
    xmb_entry_iterate,
+   xmb_load_background,
    "xmb",
 };
diff --git a/menu/menu_driver.h b/menu/menu_driver.h
index 68a48d45c4..e453b43a24 100644
--- a/menu/menu_driver.h
+++ b/menu/menu_driver.h
@@ -219,6 +219,7 @@ typedef struct menu_ctx_driver
    void  (*list_cache)(menu_handle_t *menu, bool, unsigned);
    void  (*list_set_selection)(file_list_t *list);
    int   (*entry_iterate)(menu_handle_t *menu, unsigned);
+   bool  (*load_background)(menu_handle_t *menu, const char * path);
    const char *ident;
 } menu_ctx_driver_t;
 
diff --git a/menu/menu_entries_cbs.c b/menu/menu_entries_cbs.c
index a6ef8def37..eb32305389 100644
--- a/menu/menu_entries_cbs.c
+++ b/menu/menu_entries_cbs.c
@@ -540,7 +540,15 @@ static int action_ok_menu_wallpaper_load(const char *path,
 
    fill_pathname_join(wallpaper_path, menu_path, path, sizeof(wallpaper_path));
 
+   if (!path_file_exists(wallpaper_path))
+      goto end;
+
    strlcpy(g_settings.menu.wallpaper, wallpaper_path, sizeof(g_settings.menu.wallpaper));
+
+   if (driver.menu_ctx && driver.menu_ctx->load_background)
+      driver.menu_ctx->load_background(driver.menu, wallpaper_path);
+
+end:
    menu_list_pop_stack_by_needle(driver.menu->menu_list, setting->name);
 
    return 0;