diff --git a/Makefile.common b/Makefile.common
index 3df1ba84f6..46c9d7bf67 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -409,6 +409,7 @@ ifeq ($(HAVE_MENU_COMMON), 1)
    endif
    OBJ += menu/menu_hash.o \
 			 menu/menu_driver.o \
+			 menu/menu_content.o \
           menu/intl/menu_hash_de.o \
           menu/intl/menu_hash_es.o \
           menu/intl/menu_hash_eo.o \
diff --git a/griffin/griffin.c b/griffin/griffin.c
index d455e1a895..1bf08ac69c 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -785,6 +785,7 @@ MENU
 #include "../menu/menu_entries.c"
 #include "../menu/menu_setting.c"
 #include "../menu/menu_cbs.c"
+#include "../menu/menu_content.c"
 #include "../menu/cbs/menu_cbs_ok.c"
 #include "../menu/cbs/menu_cbs_cancel.c"
 #include "../menu/cbs/menu_cbs_select.c"
diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
index b558830eb7..bde19d16c1 100644
--- a/menu/cbs/menu_cbs_ok.c
+++ b/menu/cbs/menu_cbs_ok.c
@@ -689,7 +689,7 @@ static int generic_action_ok(const char *path,
          }
          else
             ret = 0;
-#elif defined(RARCH_CONSOLE)
+#else
          /* Core selection on non-console just updates directory listing.
           * Will take effect on new content load. */
          ret = -1;
diff --git a/menu/menu_content.c b/menu/menu_content.c
new file mode 100644
index 0000000000..4bada874cc
--- /dev/null
+++ b/menu/menu_content.c
@@ -0,0 +1,16 @@
+/*  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 "menu_content.h"
diff --git a/menu/menu_content.h b/menu/menu_content.h
new file mode 100644
index 0000000000..c6cd9612ca
--- /dev/null
+++ b/menu/menu_content.h
@@ -0,0 +1,30 @@
+/*  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/>.
+ */
+
+#ifndef __MENU_CONTENT_H__
+#define __MENU_CONTENT_H__
+
+#include <stdint.h>
+#include <stdlib.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif