diff --git a/Makefile.common b/Makefile.common
index 479a252d63..4e1ebeeb70 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -652,6 +652,7 @@ endif
 ifneq ($(findstring Win32,$(OS)),)
 OBJ += ui/drivers/ui_win32.o \
 		 ui/drivers/win32/ui_win32_window.o \
+		 ui/drivers/win32/ui_win32_msg_window.o \
 		 ui/drivers/win32/ui_win32_application.o
 endif
 
diff --git a/griffin/griffin.c b/griffin/griffin.c
index f1a7c8cf63..e7e970eded 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -733,6 +733,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_msg_window.c"
 #include "../ui/drivers/win32/ui_win32_application.c"
 #endif
 
diff --git a/griffin/griffin_objc.m b/griffin/griffin_objc.m
index 2d640d1c9f..3cbd73d805 100644
--- a/griffin/griffin_objc.m
+++ b/griffin/griffin_objc.m
@@ -42,6 +42,7 @@
 #elif defined(HAVE_COCOA)
 #include "../ui/drivers/ui_cocoa.m"
 #include "../ui/drivers/cocoa/ui_cocoa_window.m"
+#include "../ui/drivers/cocoa/ui_cocoa_msg_window.m"
 #include "../ui/drivers/cocoa/ui_cocoa_application.m"
 #endif
 
diff --git a/ui/drivers/cocoa/ui_cocoa_msg_window.m b/ui/drivers/cocoa/ui_cocoa_msg_window.m
new file mode 100644
index 0000000000..38a92df741
--- /dev/null
+++ b/ui/drivers/cocoa/ui_cocoa_msg_window.m
@@ -0,0 +1,44 @@
+/* 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 enum ui_msg_window_response ui_msg_window_cocoa_error(ui_msg_window_state *state)
+{
+   return UI_MSG_RESPONSE_CANCEL;
+}
+
+static enum ui_msg_window_response ui_msg_window_cocoa_information(ui_msg_window_state *state)
+{
+   return UI_MSG_RESPONSE_CANCEL;
+}
+
+static enum ui_msg_window_response ui_msg_window_cocoa_question(ui_msg_window_state *state)
+{
+   return UI_MSG_RESPONSE_CANCEL;
+}
+
+const ui_msg_window_t ui_msg_window_cocoa = {
+   ui_msg_window_cocoa_error,
+   ui_msg_window_cocoa_information,
+   ui_msg_window_cocoa_question,
+   "cocoa"
+};
diff --git a/ui/drivers/ui_cocoa.m b/ui/drivers/ui_cocoa.m
index 881790f486..ccd0e8f548 100644
--- a/ui/drivers/ui_cocoa.m
+++ b/ui/drivers/ui_cocoa.m
@@ -585,7 +585,7 @@ const ui_companion_driver_t ui_companion_cocoa = {
    NULL,
    NULL,
    NULL,
-   &ui_msg_window_null,
+   &ui_msg_window_cocoa,
    &ui_window_cocoa,
    &ui_application_cocoa,
    "cocoa",
diff --git a/ui/drivers/ui_win32.c b/ui/drivers/ui_win32.c
index 7b338e054b..d72cd72d69 100644
--- a/ui/drivers/ui_win32.c
+++ b/ui/drivers/ui_win32.c
@@ -729,7 +729,7 @@ const ui_companion_driver_t ui_companion_win32 = {
    NULL,
    NULL,
    NULL,
-   &ui_msg_window_null,
+   &ui_msg_window_win32,
    &ui_window_win32,
    &ui_application_win32,
    "win32",
diff --git a/ui/drivers/win32/ui_win32_msg_window.c b/ui/drivers/win32/ui_win32_msg_window.c
new file mode 100644
index 0000000000..3fa9fae03f
--- /dev/null
+++ b/ui/drivers/win32/ui_win32_msg_window.c
@@ -0,0 +1,46 @@
+/* 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 <windows.h>
+
+#include "../../ui_companion_driver.h"
+
+static enum ui_msg_window_response ui_msg_window_win32_error(ui_msg_window_state *state)
+{
+   return UI_MSG_RESPONSE_CANCEL;
+}
+
+static enum ui_msg_window_response ui_msg_window_win32_information(ui_msg_window_state *state)
+{
+   return UI_MSG_RESPONSE_CANCEL;
+}
+
+static enum ui_msg_window_response ui_msg_window_win32_question(ui_msg_window_state *state)
+{
+   return UI_MSG_RESPONSE_CANCEL;
+}
+
+const ui_msg_window_t ui_msg_window_win32 = {
+   ui_msg_window_win32_error,
+   ui_msg_window_win32_information,
+   ui_msg_window_win32_question,
+   "win32"
+};
diff --git a/ui/ui_companion_driver.h b/ui/ui_companion_driver.h
index 549cd37aec..1c4e94a426 100644
--- a/ui/ui_companion_driver.h
+++ b/ui/ui_companion_driver.h
@@ -103,6 +103,8 @@ extern const ui_window_t           ui_window_cocoa;
 extern const ui_window_t           ui_window_win32;
 
 extern const ui_msg_window_t       ui_msg_window_null;
+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;