diff --git a/apple/iOS/RetroArch_iOS.xcodeproj/project.xcworkspace/xcshareddata/RetroArch_iOS.xccheckout b/apple/iOS/RetroArch_iOS.xcodeproj/project.xcworkspace/xcshareddata/RetroArch_iOS.xccheckout
index 6aaef20b8d..92a419b12f 100644
--- a/apple/iOS/RetroArch_iOS.xcodeproj/project.xcworkspace/xcshareddata/RetroArch_iOS.xccheckout
+++ b/apple/iOS/RetroArch_iOS.xcodeproj/project.xcworkspace/xcshareddata/RetroArch_iOS.xccheckout
@@ -7,7 +7,7 @@
 	<key>IDESourceControlProjectIdentifier</key>
 	<string>6D7FAF49-495D-480E-B0C9-8C39AC77CE3C</string>
 	<key>IDESourceControlProjectName</key>
-	<string>project</string>
+	<string>RetroArch_iOS</string>
 	<key>IDESourceControlProjectOriginsDictionary</key>
 	<dict>
 		<key>6B9F0B13E5864452B91F13C09B7ED9EB989E82AD</key>
@@ -24,21 +24,21 @@
 		<string>https://github.com/libretro/common-overlays.git</string>
 	</dict>
 	<key>IDESourceControlProjectPath</key>
-	<string>apple/iOS/RetroArch_iOS.xcodeproj/project.xcworkspace</string>
+	<string>apple/iOS/RetroArch_iOS.xcodeproj</string>
 	<key>IDESourceControlProjectRelativeInstallPathDictionary</key>
 	<dict>
 		<key>6B9F0B13E5864452B91F13C09B7ED9EB989E82AD</key>
-		<string>../../../..media/autoconfig/</string>
+		<string>../../../..media/autoconfig</string>
 		<key>76200F0D6584D865E96F58DE862E738E88B23A3C</key>
 		<string>../../../../..</string>
 		<key>A267D9543F572B4C32EC6E1B876E3B9BFE4DE8F6</key>
-		<string>../../../..media/assets/</string>
+		<string>../../../..media/assets</string>
 		<key>C3AEE01BDA902108663DB5DB9CD7916436919463</key>
-		<string>../../../..media/libretrodb/</string>
+		<string>../../../..media/libretrodb</string>
 		<key>C7C12374C7051F8843B3EFA1ACCAF2907102CCF7</key>
 		<string>../../../..</string>
 		<key>EF363D58F01B3FB341FA6C851870E60E4F080E97</key>
-		<string>../../../..media/overlays/</string>
+		<string>../../../..media/overlays</string>
 	</dict>
 	<key>IDESourceControlProjectURL</key>
 	<string>https://github.com/libretro/RetroArch.git</string>
diff --git a/menu/cbs/menu_cbs_select.c b/menu/cbs/menu_cbs_select.c
index 1f20018fd4..f149311727 100644
--- a/menu/cbs/menu_cbs_select.c
+++ b/menu/cbs/menu_cbs_select.c
@@ -34,32 +34,36 @@ static int action_select_default(const char *path, const char *label, unsigned t
    menu_entry_get(&entry, idx, NULL, false);
 
    cbs = menu_list_get_actiondata_at_offset(menu_list->selection_buf, idx);
-
-
-   RARCH_LOG("setting->type: %d\n", setting->type);
-
-   switch (setting->type)
+    
+   if (setting)
    {
-      case ST_BOOL:
-      case ST_INT:
-      case ST_UINT:
-      case ST_FLOAT:
-         action = MENU_ACTION_RIGHT;
-         break;
-      case ST_PATH:
-         action = MENU_ACTION_OK;
-         break;
-      default:
-         if ((cbs && cbs->action_ok) || menu_setting_is_of_general_type(setting))
-            action = MENU_ACTION_OK;
-         else
-         {
-            if (cbs && cbs->action_start)
-               action = MENU_ACTION_START;
-            if (cbs && cbs->action_right)
+       switch (setting->type)
+       {
+           case ST_BOOL:
+           case ST_INT:
+           case ST_UINT:
+           case ST_FLOAT:
                action = MENU_ACTION_RIGHT;
-         }
-         break;
+               break;
+           case ST_PATH:
+               action = MENU_ACTION_OK;
+               break;
+           default:
+               break;
+       }
+   }
+    
+   if (action == MENU_ACTION_NOOP)
+   {
+       if ((cbs && cbs->action_ok) || menu_setting_is_of_general_type(setting))
+           action = MENU_ACTION_OK;
+       else
+       {
+           if (cbs && cbs->action_start)
+               action = MENU_ACTION_START;
+           if (cbs && cbs->action_right)
+               action = MENU_ACTION_RIGHT;
+       }
    }
     
    if (action != MENU_ACTION_NOOP)
diff --git a/ui/drivers/cocoa/cocoatouch_menu.m b/ui/drivers/cocoa/cocoatouch_menu.m
index 1009e8814b..7948b51961 100644
--- a/ui/drivers/cocoa/cocoatouch_menu.m
+++ b/ui/drivers/cocoa/cocoatouch_menu.m
@@ -741,7 +741,9 @@ didSelectRowAtIndexPath:(NSIndexPath *)indexPath
 - (void)menuSelect: (uint32_t) i
 {
   menu_entry_select(i);
+#if 0
   [self willReloadData];
+#endif
 }
 
 - (void)menuBack