diff --git a/libretro-common/include/queues/message_queue.h b/libretro-common/include/queues/message_queue.h
index 560bb488e7..7e2b96df9c 100644
--- a/libretro-common/include/queues/message_queue.h
+++ b/libretro-common/include/queues/message_queue.h
@@ -56,6 +56,9 @@ msg_queue_t *msg_queue_new(size_t size);
 void msg_queue_push(msg_queue_t *queue, const char *msg,
       unsigned prio, unsigned duration);
 
+void msg_queue_push_string_list(msg_queue_t *queue, const char *msg,
+      const char *msg2, unsigned prio, unsigned duration);
+
 /**
  * msg_queue_pull:
  * @queue             : pointer to queue object
diff --git a/libretro-common/queues/message_queue.c b/libretro-common/queues/message_queue.c
index 3a4bec77c7..06ff49c42a 100644
--- a/libretro-common/queues/message_queue.c
+++ b/libretro-common/queues/message_queue.c
@@ -24,6 +24,7 @@
 #include <string.h>
 #include <boolean.h>
 #include <queues/message_queue.h>
+#include <compat/strl.h>
 #include <compat/posix_string.h>
 
 struct queue_elem
@@ -86,6 +87,7 @@ void msg_queue_free(msg_queue_t *queue)
    free(queue);
 }
 
+
 /**
  * msg_queue_push:
  * @queue             : pointer to queue object
@@ -132,6 +134,18 @@ void msg_queue_push(msg_queue_t *queue, const char *msg,
    }
 }
 
+void msg_queue_push_string_list(msg_queue_t *queue, const char *msg,
+      const char *msg2, unsigned prio, unsigned duration)
+{
+   char new_msg[8192];
+
+   strlcpy(new_msg, msg,  sizeof(new_msg));
+   strlcat(new_msg, "|",  sizeof(new_msg));
+   strlcat(new_msg, msg2, sizeof(new_msg));
+
+   msg_queue_push(queue, new_msg, prio, duration);
+}
+
 /**
  * msg_queue_clear:
  * @queue             : pointer to queue object
diff --git a/menu/menu_entries_cbs_ok.c b/menu/menu_entries_cbs_ok.c
index 70a01b4c66..cebb1edbb8 100644
--- a/menu/menu_entries_cbs_ok.c
+++ b/menu/menu_entries_cbs_ok.c
@@ -284,10 +284,8 @@ static int action_ok_core_updater_list(const char *path,
    fill_pathname_join(url_path, g_settings.network.buildbot_url,
          ".index", sizeof(url_path));
 
-   strlcat(url_path, "|cb_core_updater_list", sizeof(url_path));
-
    msg_queue_clear(g_runloop.data.http.msg_queue);
-   msg_queue_push(g_runloop.data.http.msg_queue, url_path, 0, 1);
+   msg_queue_push_string_list(g_runloop.data.http.msg_queue, url_path, "cb_core_updater_list", 0, 1);
 #endif
 
    return menu_list_push_stack_refresh(
@@ -424,10 +422,9 @@ static int action_ok_menu_wallpaper_load(const char *path,
    if (path_file_exists(wallpaper_path))
    {
       strlcpy(g_settings.menu.wallpaper, wallpaper_path, sizeof(g_settings.menu.wallpaper));
-      strlcat(wallpaper_path, "|cb_menu_wallpaper", sizeof(wallpaper_path));
 
       msg_queue_clear(g_runloop.data.nbio.image.msg_queue);
-      msg_queue_push(g_runloop.data.nbio.image.msg_queue, wallpaper_path, 0, 1);
+      msg_queue_push_string_list(g_runloop.data.nbio.image.msg_queue, wallpaper_path, "cb_menu_wallpaper", 0, 1);
    }
 
    menu_list_pop_stack_by_needle(menu->menu_list, setting->name);
@@ -893,6 +890,7 @@ static int action_ok_core_updater_download(const char *path,
 {
 #ifdef HAVE_NETWORKING
    char core_path[PATH_MAX_LENGTH], msg[PATH_MAX_LENGTH];
+
    fill_pathname_join(core_path, g_settings.network.buildbot_url,
          path, sizeof(core_path));
 
@@ -902,10 +900,8 @@ static int action_ok_core_updater_download(const char *path,
    msg_queue_clear(g_runloop.msg_queue);
    msg_queue_push(g_runloop.msg_queue, msg, 1, 90);
 
-   strlcat(core_path, "|cb_core_updater_download", sizeof(core_path));
-
    msg_queue_clear(g_runloop.data.http.msg_queue);
-   msg_queue_push(g_runloop.data.http.msg_queue, core_path, 0, 1);
+   msg_queue_push_string_list(g_runloop.data.http.msg_queue, core_path, "cb_core_updater_download", 0, 1);
 #endif
    return 0;
 }