diff --git a/menu/drivers_backend/menu_common_backend.c b/menu/drivers_backend/menu_common_backend.c
index 126e98e211..2c62bfe119 100644
--- a/menu/drivers_backend/menu_common_backend.c
+++ b/menu/drivers_backend/menu_common_backend.c
@@ -60,7 +60,7 @@ static int menu_info_screen_iterate(unsigned action)
    if (current_setting)
       strlcpy(needle, current_setting->name, sizeof(needle));
    else if ((current_setting = (rarch_setting_t*)setting_data_find_setting(
-               driver.menu->list_mainmenu,
+               driver.menu->list_settings,
                list->list[driver.menu->selection_ptr].label)))
    {
       if (current_setting)
diff --git a/menu/menu.c b/menu/menu.c
index 689df6d63f..10285b4d00 100644
--- a/menu/menu.c
+++ b/menu/menu.c
@@ -212,10 +212,7 @@ void menu_free_list(void *data)
    if (!menu)
       return;
 
-   settings_list_free(menu->list_mainmenu);
    settings_list_free(menu->list_settings);
-
-   menu->list_mainmenu = NULL;
    menu->list_settings = NULL;
 }
 
diff --git a/menu/menu_action.c b/menu/menu_action.c
index ee2a36ea3a..99cb9fc634 100644
--- a/menu/menu_action.c
+++ b/menu/menu_action.c
@@ -119,18 +119,10 @@ static rarch_setting_t *find_setting(void)
    const file_list_t *list = (const file_list_t*)
       driver.menu->menu_list->selection_buf;
 
-   /* Check if setting belongs to settings menu. */
-
    rarch_setting_t *setting = (rarch_setting_t*)setting_data_find_setting(
          driver.menu->list_settings,
          list->list[driver.menu->selection_ptr].label);
 
-   /* Check if setting belongs to main menu. */
-   if (!setting)
-      setting = (rarch_setting_t*)setting_data_find_setting(
-            driver.menu->list_mainmenu,
-            list->list[driver.menu->selection_ptr].label);
-
    return setting;
 }
 
diff --git a/menu/menu_driver.h b/menu/menu_driver.h
index 136606f934..d6db0ae0ba 100644
--- a/menu/menu_driver.h
+++ b/menu/menu_driver.h
@@ -138,7 +138,6 @@ typedef struct
       unsigned idx;
    } keyboard;
 
-   rarch_setting_t *list_mainmenu;
    rarch_setting_t *list_settings;
 } menu_handle_t;
 
diff --git a/menu/menu_entries.c b/menu/menu_entries.c
index 70e202b7be..467c356ffe 100644
--- a/menu/menu_entries.c
+++ b/menu/menu_entries.c
@@ -53,9 +53,9 @@ int menu_entries_push_main_menu_list(menu_handle_t *menu,
 {
    rarch_setting_t *setting = NULL;
    
-   settings_list_free(menu->list_mainmenu);
-   menu->list_mainmenu = (rarch_setting_t *)setting_data_new(SL_FLAG_MAIN_MENU);
-   setting = (rarch_setting_t*)setting_data_find_setting(menu->list_mainmenu,
+   settings_list_free(menu->list_settings);
+   menu->list_settings = (rarch_setting_t *)setting_data_new(SL_FLAG_MAIN_MENU);
+   setting = (rarch_setting_t*)setting_data_find_setting(menu->list_settings,
          label);
 
    if (!setting)
@@ -434,7 +434,6 @@ bool menu_entries_init(menu_handle_t *menu)
    if (!menu)
       return false;
 
-   menu->list_mainmenu = setting_data_new(SL_FLAG_MAIN_MENU);
    menu->list_settings = setting_data_new(SL_FLAG_ALL_SETTINGS);
 
    menu_list_push_stack(menu->menu_list, "", "Main Menu", MENU_SETTINGS, 0);
diff --git a/settings_data.c b/settings_data.c
index 6eee664d15..1b36e1afee 100644
--- a/settings_data.c
+++ b/settings_data.c
@@ -2947,7 +2947,7 @@ void setting_data_get_label(char *type_str,
       if (!driver.menu || !driver.menu->menu_list)
          return;
 
-      setting_data = (rarch_setting_t*)driver.menu->list_mainmenu;
+      setting_data = (rarch_setting_t*)driver.menu->list_settings;
 
       setting = (rarch_setting_t*)setting_data_find_setting(setting_data,
             driver.menu->menu_list->selection_buf->list[idx].label);