diff --git a/Makefile.common b/Makefile.common
index 8cc8590a9b..8c4a6d722a 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -248,7 +248,9 @@ endif
 
 ifeq ($(HAVE_QT), 1)
 HAVE_QT_WRAPPER=0
-OBJ += ui/drivers/ui_qt.o
+OBJ += ui/drivers/ui_qt.o \
+		 ui/drivers/qt/ui_qt_window.o
+
 # TODO/FIXME - figure out which libraries we need to link against
 LIBS += -lQt5Quick -lQt5Widgets -lQt5Gui -lQt5Qml -lQt5Network -lQt5Core -L./ui/drivers/qt/wrapper/build/release
 
diff --git a/griffin/griffin_cpp.cpp b/griffin/griffin_cpp.cpp
index f1d4a01743..4d7b29ca16 100644
--- a/griffin/griffin_cpp.cpp
+++ b/griffin/griffin_cpp.cpp
@@ -128,6 +128,10 @@ UI
 #include "../ui/drivers/win32/ui_win32_window.cpp"
 #endif
 
+#if defined(HAVE_QT)
+#include "../ui/drivers/qt/ui_qt_window.cpp"
+#endif
+
 /*============================================================
 VIDEO DRIVER
 ============================================================ */
diff --git a/ui/drivers/qt/ui_qt_window.cpp b/ui/drivers/qt/ui_qt_window.cpp
new file mode 100644
index 0000000000..b961fd4d5f
--- /dev/null
+++ b/ui/drivers/qt/ui_qt_window.cpp
@@ -0,0 +1,60 @@
+/* RetroArch - A frontend for libretro.
+ *  Copyright (C) 2011-2016 - Daniel De Matteis
+ *
+ * RetroArch is free software: you can redistribute it and/or modify it under the terms
+ * of the GNU General Public License as published by the Free Software Found-
+ * ation, either version 3 of the License, or (at your option) any later version.
+ *
+ * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with RetroArch.
+ * If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <stdint.h>
+#include <boolean.h>
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "wrapper/wrapper.h"
+
+#include "../../ui_companion_driver.h"
+
+static void ui_window_qt_destroy(void *data)
+{
+}
+
+static void ui_window_qt_set_focused(void *data)
+{
+}
+
+static void ui_window_qt_set_visible(void *data,
+        bool set_visible)
+{
+}
+
+static void ui_window_qt_set_title(void *data, char *buf)
+{
+}
+
+static void ui_window_qt_set_droppable(void *data, bool droppable)
+{
+}
+
+static bool ui_window_qt_focused(void *data)
+{
+   return true;
+}
+
+const ui_window_t ui_window_qt = {
+   ui_window_qt_destroy,
+   ui_window_qt_set_focused,
+   ui_window_qt_set_visible,
+   ui_window_qt_set_title,
+   ui_window_qt_set_droppable,
+   ui_window_qt_focused,
+   "qt"
+};
diff --git a/ui/drivers/ui_qt.c b/ui/drivers/ui_qt.c
index 6d9ab10064..981ca0b0bd 100644
--- a/ui/drivers/ui_qt.c
+++ b/ui/drivers/ui_qt.c
@@ -145,7 +145,7 @@ const ui_companion_driver_t ui_companion_qt = {
    NULL,
    &ui_browser_window_null,
    &ui_msg_window_null,
-   &ui_window_null,
+   &ui_window_qt,
    &ui_application_null,
    "qt",
 };
diff --git a/ui/ui_companion_driver.h b/ui/ui_companion_driver.h
index 82f73264d1..6ecfa11f65 100644
--- a/ui/ui_companion_driver.h
+++ b/ui/ui_companion_driver.h
@@ -145,6 +145,7 @@ extern const ui_browser_window_t   ui_browser_window_win32;
 
 extern const ui_window_t           ui_window_null;
 extern const ui_window_t           ui_window_cocoa;
+extern const ui_window_t           ui_window_qt;
 extern const ui_window_t           ui_window_win32;
 
 extern const ui_msg_window_t       ui_msg_window_null;