diff --git a/Makefile.common b/Makefile.common
index 8be4c7266a..1822a2363b 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -650,7 +650,8 @@ endif
 
 ifneq ($(findstring Win32,$(OS)),)
 OBJ += ui/drivers/ui_win32.o \
-		 ui/drivers/win32/ui_win32_window.o
+		 ui/drivers/win32/ui_win32_window.o \
+		 ui/drivers/win32/ui_win32_application.o
 endif
 
 # Video
diff --git a/griffin/griffin.c b/griffin/griffin.c
index 5c2a4aa4fe..020b6c5770 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -732,6 +732,7 @@ UI
 #if defined(_WIN32) && !defined(_XBOX)
 #include "../ui/drivers/ui_win32.c"
 #include "../ui/drivers/win32/ui_win32_window.c"
+#include "../ui/drivers/win32/ui_win32_application.c"
 #endif
 
 /*============================================================
diff --git a/ui/drivers/ui_win32.c b/ui/drivers/ui_win32.c
index 9450e3d00b..a33dd27757 100644
--- a/ui/drivers/ui_win32.c
+++ b/ui/drivers/ui_win32.c
@@ -730,6 +730,6 @@ const ui_companion_driver_t ui_companion_win32 = {
    NULL,
    NULL,
    &ui_window_win32,
-   &ui_application_null,
+   &ui_application_win32,
    "win32",
 };
diff --git a/ui/drivers/win32/ui_win32_application.c b/ui/drivers/win32/ui_win32_application.c
new file mode 100644
index 0000000000..2b0bf4b2f9
--- /dev/null
+++ b/ui/drivers/win32/ui_win32_application.c
@@ -0,0 +1,31 @@
+/* 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 void ui_application_win32_process_events(void *data)
+{
+}
+
+const ui_application_t ui_application_win32 = {
+   ui_application_win32_process_events,
+   "win32"
+};
diff --git a/ui/ui_companion_driver.h b/ui/ui_companion_driver.h
index 71996d5c0f..44710f02af 100644
--- a/ui/ui_companion_driver.h
+++ b/ui/ui_companion_driver.h
@@ -70,6 +70,7 @@ extern const ui_window_t           ui_window_cocoa;
 extern const ui_window_t           ui_window_win32;
 
 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_companion_driver_t ui_companion_null;