diff --git a/frontend/frontend.c b/frontend/frontend.c
index 46316caebc..d25ff68a65 100644
--- a/frontend/frontend.c
+++ b/frontend/frontend.c
@@ -157,6 +157,8 @@ static void check_defaults_dirs(void)
       path_mkdir(g_defaults.database_dir);
    if (*g_defaults.cursor_dir)
       path_mkdir(g_defaults.cursor_dir);
+   if (*g_defaults.cheats_dir)
+      path_mkdir(g_defaults.cheats_dir);
 }
 
 static void history_playlist_push(content_playlist_t *playlist,
diff --git a/general.h b/general.h
index 0c01a3284f..99e29ae69f 100644
--- a/general.h
+++ b/general.h
@@ -114,6 +114,7 @@ struct defaults
    char extraction_dir[PATH_MAX_LENGTH];
    char database_dir[PATH_MAX_LENGTH];
    char cursor_dir[PATH_MAX_LENGTH];
+   char cheats_dir[PATH_MAX_LENGTH];
 
    struct
    {
diff --git a/settings.c b/settings.c
index f9a62dabd3..9d6a586c40 100644
--- a/settings.c
+++ b/settings.c
@@ -656,6 +656,9 @@ static void config_set_defaults(void)
    if (*g_defaults.cursor_dir)
       strlcpy(g_settings.cursor_directory, g_defaults.cursor_dir,
             sizeof(g_settings.cursor_directory));
+   if (*g_defaults.cheats_dir)
+      strlcpy(g_settings.cheat_database, g_defaults.cheats_dir,
+            sizeof(g_settings.cheat_database));
    if (*g_defaults.core_info_dir)
       fill_pathname_expand_special(g_settings.libretro_info_path,
             g_defaults.core_info_dir, sizeof(g_settings.libretro_info_path));