diff --git a/griffin/griffin.c b/griffin/griffin.c
index 3a48eb8dbc..f3433d1713 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_browser_window.c"
#include "../ui/drivers/win32/ui_win32_msg_window.c"
#include "../ui/drivers/win32/ui_win32_application.c"
#endif
diff --git a/ui/drivers/cocoa/ui_cocoa_browser_window.m b/ui/drivers/cocoa/ui_cocoa_browser_window.m
new file mode 100644
index 0000000000..bd1d2135b8
--- /dev/null
+++ b/ui/drivers/cocoa/ui_cocoa_browser_window.m
@@ -0,0 +1,40 @@
+/* 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 .
+ */
+
+#include
+#include
+#include
+#include
+#include
+
+#include "cocoa_common.h"
+
+#include "../../ui_companion_driver.h"
+
+static bool ui_browser_window_cocoa_open(ui_browser_window_state_t *state)
+{
+ return false;
+}
+
+static bool ui_browser_window_cocoa_save(ui_browser_window_state_t *state)
+{
+ return false;
+}
+
+const ui_browser_window_t ui_browser_window_cocoa = {
+ ui_browser_window_cocoa_open,
+ ui_browser_window_cocoa_save,
+ "cocoa"
+};
diff --git a/ui/drivers/ui_cocoa.m b/ui/drivers/ui_cocoa.m
index 2db46d31bb..a1c50d1905 100644
--- a/ui/drivers/ui_cocoa.m
+++ b/ui/drivers/ui_cocoa.m
@@ -581,7 +581,7 @@ const ui_companion_driver_t ui_companion_cocoa = {
NULL,
NULL,
NULL,
- &ui_browser_window_null,
+ &ui_browser_window_cocoa,
&ui_msg_window_cocoa,
&ui_window_cocoa,
&ui_application_cocoa,
diff --git a/ui/drivers/ui_win32.c b/ui/drivers/ui_win32.c
index fc47842982..86390a2877 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_browser_window_null,
+ &ui_browser_window_win32,
&ui_msg_window_win32,
&ui_window_win32,
&ui_application_win32,
diff --git a/ui/drivers/win32/ui_win32_browser_window.c b/ui/drivers/win32/ui_win32_browser_window.c
new file mode 100644
index 0000000000..c9fa086c76
--- /dev/null
+++ b/ui/drivers/win32/ui_win32_browser_window.c
@@ -0,0 +1,40 @@
+/* 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 .
+ */
+
+#include
+#include
+#include
+#include
+#include
+
+#include
+
+#include "../../ui_companion_driver.h"
+
+static bool ui_browser_window_win32_open(ui_browser_window_state_t *state)
+{
+ return false;
+}
+
+static bool ui_browser_window_win32_save(ui_browser_window_state_t *state)
+{
+ return false;
+}
+
+const ui_browser_window_t ui_browser_window_win32 = {
+ ui_browser_window_win32_open,
+ ui_browser_window_win32_save,
+ "win32"
+};
diff --git a/ui/ui_companion_driver.h b/ui/ui_companion_driver.h
index 80db91a131..f119e73fa4 100644
--- a/ui/ui_companion_driver.h
+++ b/ui/ui_companion_driver.h
@@ -124,6 +124,8 @@ typedef struct ui_companion_driver
} ui_companion_driver_t;
extern const ui_browser_window_t ui_browser_window_null;
+extern const ui_browser_window_t ui_browser_window_cocoa;
+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;