diff --git a/qb/config.libs.sh b/qb/config.libs.sh
index f12aaef29d..c19fe32a9d 100644
--- a/qb/config.libs.sh
+++ b/qb/config.libs.sh
@@ -313,6 +313,7 @@ if [ "$HAVE_QT" != 'no' ]; then
       then
          HAVE_QT6='yes'
          add_define MAKEFILE HAVE_QT6 1
+         add_define CONFIG HAVE_QT6 1
       fi
    fi
    if [ "$HAVE_QT6" != 'yes' ]; then
diff --git a/ui/ui_companion_driver.c b/ui/ui_companion_driver.c
index 382b11243e..bec38828a7 100644
--- a/ui/ui_companion_driver.c
+++ b/ui/ui_companion_driver.c
@@ -140,7 +140,11 @@ void ui_companion_driver_init_first(
 {
    uico_driver_state_t *uico_st        = &uico_driver_st;
 #ifdef HAVE_QT
+#ifdef HAVE_QT6  /* FIXME: deferred initialization after loading/unloading content */
+   if (desktop_menu_enable)
+#else
    if (desktop_menu_enable && ui_companion_toggle)
+#endif
    {
       uico_st->qt_data                 = ui_companion_qt.init();
       uico_st->flags                  |= UICO_ST_FLAG_QT_IS_INITED;