diff --git a/Makefile.common b/Makefile.common
index db933d9c46..f5e4dca56e 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -322,6 +322,7 @@ ifeq ($(HAVE_MENU_COMMON), 1)
 			 menu/menu_entries_cbs_representation.o \
 			 menu/menu_entries_cbs_iterate.o \
 			 menu/menu_entries_cbs_up_or_down.o \
+			 menu/menu_entries_cbs_contentlist_switch.o \
 			 menu/menu_entries_cbs.o \
 			 menu/menu_list.o \
 			 menu/menu_animation.o
diff --git a/griffin/griffin.c b/griffin/griffin.c
index eba2c043ee..4c096c9462 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -689,6 +689,7 @@ MENU
 #include "../menu/menu_entries_cbs_representation.c"
 #include "../menu/menu_entries_cbs_iterate.c"
 #include "../menu/menu_entries_cbs_up_or_down.c"
+#include "../menu/menu_entries_cbs_contentlist_switch.c"
 #include "../menu/menu_entries_cbs.c"
 #include "../menu/menu_shader.c"
 #include "../menu/menu_texture.c"
diff --git a/menu/menu_entries_cbs.c b/menu/menu_entries_cbs.c
index 78a9d0608d..db34e81c94 100644
--- a/menu/menu_entries_cbs.c
+++ b/menu/menu_entries_cbs.c
@@ -152,16 +152,6 @@ int cb_core_updater_download(void *data_, size_t len)
 }
 #endif
 
-static void menu_entries_cbs_init_bind_content_list_switch(menu_file_list_cbs_t *cbs,
-      const char *path, const char *label, unsigned type, size_t idx,
-      const char *elem0, const char *elem1)
-{
-   if (!cbs)
-      return;
-
-   cbs->action_content_list_switch = deferred_push_content_list;
-}
-
 int menu_entries_common_is_settings_entry(const char *label)
 {
    return (
diff --git a/menu/menu_entries_cbs.h b/menu/menu_entries_cbs.h
index ebec72578a..5d6dbd47d3 100644
--- a/menu/menu_entries_cbs.h
+++ b/menu/menu_entries_cbs.h
@@ -54,6 +54,10 @@ void menu_entries_cbs_init_bind_start(menu_file_list_cbs_t *cbs,
       const char *path, const char *label, unsigned type, size_t idx,
       const char *elem0, const char *elem1);
 
+void menu_entries_cbs_init_bind_content_list_switch(menu_file_list_cbs_t *cbs,
+      const char *path, const char *label, unsigned type, size_t idx,
+      const char *elem0, const char *elem1);
+
 void menu_entries_cbs_init_bind_cancel(menu_file_list_cbs_t *cbs,
       const char *path, const char *label, unsigned type, size_t idx,
       const char *elem0, const char *elem1);
diff --git a/menu/menu_entries_cbs_contentlist_switch.c b/menu/menu_entries_cbs_contentlist_switch.c
new file mode 100644
index 0000000000..a475881d8b
--- /dev/null
+++ b/menu/menu_entries_cbs_contentlist_switch.c
@@ -0,0 +1,56 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2011-2015 - 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 <file/file_path.h>
+#include "menu.h"
+#include "menu_entries_cbs.h"
+#include "menu_setting.h"
+#include "menu_input.h"
+#include "menu_entries.h"
+#include "menu_shader.h"
+#include "menu_navigation.h"
+
+#include "../file_ext.h"
+#include "../file_extract.h"
+#include "../file_ops.h"
+#include "../config.def.h"
+#include "../cheats.h"
+#include "../retroarch.h"
+#include "../performance.h"
+
+#ifdef HAVE_NETWORKING
+#include "../net_http.h"
+#endif
+
+#ifdef HAVE_LIBRETRODB
+#include "../database_info.h"
+#endif
+
+#include "menu_database.h"
+
+#include "../input/input_autodetect.h"
+#include "../input/input_remapping.h"
+
+#include "../gfx/video_viewport.h"
+
+void menu_entries_cbs_init_bind_content_list_switch(menu_file_list_cbs_t *cbs,
+      const char *path, const char *label, unsigned type, size_t idx,
+      const char *elem0, const char *elem1)
+{
+   if (!cbs)
+      return;
+
+   cbs->action_content_list_switch = deferred_push_content_list;
+}