diff --git a/Makefile.common b/Makefile.common
index fc22528afb..cab7d79d0c 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -273,7 +273,8 @@ endif
 # Qt
 
 ifeq ($(HAVE_QT_WRAPPER), 1)
-LIBS += -lQt5Quick -lQt5Widgets -lQt5Gui -lQt5Qml -lQt5Network -lQt5Core -L./ui/drivers/qt/obj/
+OBJ += ui/drivers/ui_qt.o
+LIBS += -lQt5Quick -lQt5Widgets -lQt5Gui -lQt5Qml -lQt5Network -lQt5Core -L./ui/drivers/qt/build/release/
 LIBS += -lwrapper
 endif
 
diff --git a/griffin/griffin_cpp.cpp b/griffin/griffin_cpp.cpp
index 80621c44a7..bbd0dbd3c9 100644
--- a/griffin/griffin_cpp.cpp
+++ b/griffin/griffin_cpp.cpp
@@ -152,6 +152,10 @@ UI
 #include "../ui/drivers/qt/ui_qt_application.cpp"
 #endif
 
+#if defined(HAVE_QT_WRAPPER)
+#include "../ui/drivers/ui_qt.cpp"
+#endif
+
 /*============================================================
 VIDEO DRIVER
 ============================================================ */
diff --git a/ui/drivers/qt/wimp/main.qml b/ui/drivers/qt/wimp/main.qml
index 2223ded258..5cb25d91d1 100644
--- a/ui/drivers/qt/wimp/main.qml
+++ b/ui/drivers/qt/wimp/main.qml
@@ -30,7 +30,7 @@ ApplicationWindow {
     initialPage: Page {
         id: page
 
-        title: "RetroArch"
+        title: "QT!"
 
         tabs: navDrawer.enabled ? [] : sectionTitles
 
diff --git a/ui/drivers/ui_qt.cpp b/ui/drivers/ui_qt.cpp
index 09bdf2d204..e074b1d2dd 100644
--- a/ui/drivers/ui_qt.cpp
+++ b/ui/drivers/ui_qt.cpp
@@ -26,9 +26,12 @@
 #include "../../config.h"
 #endif
 
-
-#include "ui_qt.h"
+#ifdef HAVE_QT_WRAPPER
 #include "qt/wrapper/wrapper.h"
+#else
+#include "ui_qt.h"
+#endif
+
 #include "../ui_companion_driver.h"
 #include "../../core.h"
 #include "../../configuration.h"
@@ -151,9 +154,16 @@ const ui_companion_driver_t ui_companion_qt = {
    NULL,
    NULL,
    NULL,
+#ifdef HAVE_QT_WRAPPER
+   NULL,
+   NULL,
+   NULL,
+   NULL,
+#else
    &ui_browser_window_qt,
    &ui_msg_window_qt,
    &ui_window_qt,
    &ui_application_qt,
+#endif
    "qt",
 };
diff --git a/ui/ui_companion_driver.c b/ui/ui_companion_driver.c
index 524cab6be3..6762f63ae2 100644
--- a/ui/ui_companion_driver.c
+++ b/ui/ui_companion_driver.c
@@ -28,6 +28,9 @@
 
 
 static const ui_companion_driver_t *ui_companion_drivers[] = {
+#ifdef HAVE_QT_WRAPPER
+   &ui_companion_qt,
+#endif
 #if defined(_WIN32) && !defined(_XBOX)
    &ui_companion_win32,
 #endif