diff --git a/Makefile.common b/Makefile.common
index 8c4a6d722a..e879192b67 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -249,6 +249,7 @@ endif
 ifeq ($(HAVE_QT), 1)
 HAVE_QT_WRAPPER=0
 OBJ += ui/drivers/ui_qt.o \
+		 ui/drivers/qt/ui_qt_application.o \
 		 ui/drivers/qt/ui_qt_window.o
 
 # TODO/FIXME - figure out which libraries we need to link against
diff --git a/griffin/griffin_cpp.cpp b/griffin/griffin_cpp.cpp
index 4d7b29ca16..8712c83b78 100644
--- a/griffin/griffin_cpp.cpp
+++ b/griffin/griffin_cpp.cpp
@@ -130,6 +130,7 @@ UI
 
 #if defined(HAVE_QT)
 #include "../ui/drivers/qt/ui_qt_window.cpp"
+#include "../ui/drivers/qt/ui_qt_application.cpp"
 #endif
 
 /*============================================================
diff --git a/ui/drivers/qt/ui_qt_application.cpp b/ui/drivers/qt/ui_qt_application.cpp
new file mode 100644
index 0000000000..46654e0455
--- /dev/null
+++ b/ui/drivers/qt/ui_qt_application.cpp
@@ -0,0 +1,43 @@
+/* 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 "../../ui_companion_driver.h"
+
+static bool ui_application_qt_initialize(void)
+{
+   return true;
+}
+
+static bool ui_application_qt_pending_events(void)
+{
+   return true;
+}
+
+static void ui_application_qt_process_events(void)
+{
+}
+
+const ui_application_t ui_application_qt = {
+   ui_application_qt_initialize,
+   ui_application_qt_pending_events,
+   ui_application_qt_process_events,
+   "qt"
+};
diff --git a/ui/drivers/ui_qt.c b/ui/drivers/ui_qt.c
index 981ca0b0bd..8bdf23a3cc 100644
--- a/ui/drivers/ui_qt.c
+++ b/ui/drivers/ui_qt.c
@@ -146,6 +146,6 @@ const ui_companion_driver_t ui_companion_qt = {
    &ui_browser_window_null,
    &ui_msg_window_null,
    &ui_window_qt,
-   &ui_application_null,
+   &ui_application_qt,
    "qt",
 };
diff --git a/ui/ui_companion_driver.h b/ui/ui_companion_driver.h
index 6ecfa11f65..9708cee775 100644
--- a/ui/ui_companion_driver.h
+++ b/ui/ui_companion_driver.h
@@ -153,8 +153,9 @@ extern const ui_msg_window_t       ui_msg_window_win32;
 extern const ui_msg_window_t       ui_msg_window_cocoa;
 
 extern const ui_application_t      ui_application_null;
-extern const ui_application_t      ui_application_win32;
 extern const ui_application_t      ui_application_cocoa;
+extern const ui_application_t      ui_application_qt;
+extern const ui_application_t      ui_application_win32;
 
 extern const ui_companion_driver_t ui_companion_null;
 extern const ui_companion_driver_t ui_companion_cocoa;