diff --git a/menu/widgets/menu_widgets.c b/menu/widgets/menu_widgets.c
index bddbde8a29..e790268158 100644
--- a/menu/widgets/menu_widgets.c
+++ b/menu/widgets/menu_widgets.c
@@ -339,9 +339,6 @@ bool menu_widgets_msg_queue_push(
 {
    menu_widget_msg_t* msg_widget = NULL;
 
-   ui_companion_driver_msg_queue_push(msg,
-         prio, task ? duration : duration * 60 / 1000, flush);
-
    if (fifo_write_avail(msg_queue) > 0)
    {
       /* Get current msg if it exists */
diff --git a/retroarch.c b/retroarch.c
index e44273dc8f..1ab9abd298 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -811,7 +811,8 @@ const ui_application_t *ui_companion_driver_get_application_ptr(void)
    return ui->application;
 }
 
-void ui_companion_driver_msg_queue_push(const char *msg, unsigned priority, unsigned duration, bool flush)
+static void ui_companion_driver_msg_queue_push(
+      const char *msg, unsigned priority, unsigned duration, bool flush)
 {
    const ui_companion_driver_t *ui = ui_companion;
 #ifdef HAVE_QT
@@ -14228,6 +14229,8 @@ void runloop_task_msg_queue_push(retro_task_t *task, const char *msg,
    if (ready && task->title && !task->mute)
    {
       runloop_msg_queue_lock();
+      ui_companion_driver_msg_queue_push(msg,
+            prio, task ? duration : duration * 60 / 1000, flush);
       menu_widgets_msg_queue_push(task, msg, duration, NULL, (enum message_queue_icon)MESSAGE_QUEUE_CATEGORY_INFO, (enum message_queue_category)MESSAGE_QUEUE_ICON_DEFAULT, prio, flush);
       runloop_msg_queue_unlock();
    }
@@ -14249,6 +14252,8 @@ void runloop_msg_queue_push(const char *msg,
 #if defined(HAVE_MENU) && defined(HAVE_MENU_WIDGETS)
    if (menu_widgets_ready())
    {
+      ui_companion_driver_msg_queue_push(msg,
+            prio, duration * 60 / 1000, flush);
       menu_widgets_msg_queue_push(NULL, msg,
             roundf((float)duration / 60.0f * 1000.0f), title, icon, category, prio, flush);
       runloop_msg_queue_unlock();
@@ -14269,7 +14274,6 @@ void runloop_msg_queue_push(const char *msg,
       msg_queue_push(runloop_msg_queue, msg_info.msg,
             msg_info.prio, msg_info.duration,
             title, icon, category);
-
       ui_companion_driver_msg_queue_push(msg_info.msg,
             msg_info.prio, msg_info.duration, msg_info.flush);
    }
diff --git a/ui/ui_companion_driver.h b/ui/ui_companion_driver.h
index f358843272..c31df93f1d 100644
--- a/ui/ui_companion_driver.h
+++ b/ui/ui_companion_driver.h
@@ -226,8 +226,6 @@ const ui_application_t *ui_companion_driver_get_qt_application_ptr(void);
 
 void ui_companion_driver_log_msg(const char *msg);
 
-void ui_companion_driver_msg_queue_push(const char *msg, unsigned priority, unsigned duration, bool flush);
-
 void *ui_companion_driver_get_main_window(void);
 
 const char *ui_companion_driver_get_ident(void);