diff --git a/frontend/frontend.c b/frontend/frontend.c
index 8811593227..62c999e129 100644
--- a/frontend/frontend.c
+++ b/frontend/frontend.c
@@ -339,6 +339,12 @@ returntype main_entry(signature())
    if (driver)
       driver->ui_companion = (ui_companion_driver_t*)ui_companion_init_first();
 
+   if (driver->ui_companion && driver->ui_companion->toggle)
+   {
+      if (settings->ui.companion_start_on_boot)
+         driver->ui_companion->toggle(driver->ui_companion_data);
+   }
+
 #if defined(HAVE_MAIN_LOOP)
    while (rarch_main_iterate() != -1);
 
diff --git a/ui/ui_companion_driver.h b/ui/ui_companion_driver.h
index 57cf619e3c..7c02dd0cad 100644
--- a/ui/ui_companion_driver.h
+++ b/ui/ui_companion_driver.h
@@ -33,7 +33,7 @@ typedef struct ui_companion_driver
    void *(*init)(void);
    void (*deinit)(void *data);
    int  (*iterate)(void *data, unsigned action);
-   void (*toggle_companion_ui)(void *data);
+   void (*toggle)(void *data);
    void (*notify_content_loaded)(void *data);
 
    const char *ident;