diff --git a/menu/menu_common.c b/menu/menu_common.c
index db4f84d82b..0320ef90f1 100644
--- a/menu/menu_common.c
+++ b/menu/menu_common.c
@@ -471,6 +471,7 @@ unsigned menu_common_type_is(const char *label, unsigned type)
          !strcmp(label, "rgui_browser_directory") ||
          !strcmp(label, "content_directory") ||
          !strcmp(label, "assets_directory") ||
+         !strcmp(label, "cheat_database_path") ||
          !strcmp(label, "video_shader_dir") ||
          !strcmp(label, "video_filter_dir") ||
          !strcmp(label, "audio_filter_dir") ||
diff --git a/retroarch.c b/retroarch.c
index ee24332830..fb8f07e85f 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -1117,8 +1117,10 @@ static void init_cheats(void)
    if (!allow_cheats)
       return;
 
+#if 0
    if (*g_settings.cheat_database)
       g_extern.cheat = cheat_manager_new_from_xml(g_settings.cheat_database);
+#endif
 }
 
 static void init_rewind(void)
diff --git a/settings_data.c b/settings_data.c
index aae384ad4f..6c9db6be6a 100644
--- a/settings_data.c
+++ b/settings_data.c
@@ -5119,16 +5119,20 @@ static bool setting_data_append_list_path_options(
          general_read_handler);
    settings_data_list_current_add_flags(list, list_info, SD_FLAG_ALLOW_EMPTY);
 
-   CONFIG_PATH(
+   CONFIG_DIR(
          g_settings.cheat_database,
          "cheat_database_path",
          "Cheat Database Directory",
          "",
-         "Paths",
+         "<None>",
+         group_info.name,
          subgroup_info.name,
          general_write_handler,
          general_read_handler);
-   settings_data_list_current_add_flags(list, list_info, SD_FLAG_ALLOW_EMPTY);
+   settings_data_list_current_add_flags(
+         list,
+         list_info,
+         SD_FLAG_ALLOW_EMPTY | SD_FLAG_PATH_DIR);
 
    CONFIG_PATH(
          g_settings.content_history_path,