diff --git a/frontend/menu/backend/menu_common_backend.c b/frontend/menu/backend/menu_common_backend.c
index ee190b82d0..86fac01561 100644
--- a/frontend/menu/backend/menu_common_backend.c
+++ b/frontend/menu/backend/menu_common_backend.c
@@ -56,7 +56,7 @@ static int menu_message_toggle(unsigned action)
       driver.menu_ctx->render_messagebox(driver.menu->message_contents);
 
    if (action == MENU_ACTION_OK)
-      menu_entries_pop(driver.menu->menu_stack);
+      menu_entries_pop_list(driver.menu->menu_stack);
 
    return 0;
 }
@@ -111,7 +111,7 @@ static int menu_info_screen_iterate(unsigned action)
    }
 
    if (action == MENU_ACTION_OK)
-      menu_entries_pop(driver.menu->menu_stack);
+      menu_entries_pop_list(driver.menu->menu_stack);
 
    return 0;
 }
@@ -178,7 +178,7 @@ static int menu_start_screen_iterate(unsigned action)
       driver.menu_ctx->render_messagebox(msg);
 
    if (action == MENU_ACTION_OK)
-      menu_entries_pop(driver.menu->menu_stack);
+      menu_entries_pop_list(driver.menu->menu_stack);
 
    return 0;
 }
@@ -443,7 +443,7 @@ static int menu_settings_iterate(unsigned action)
          break;
 
       case MENU_ACTION_CANCEL:
-         menu_entries_pop(driver.menu->menu_stack);
+         menu_entries_pop_list(driver.menu->menu_stack);
          break;
       case MENU_ACTION_SELECT:
          file_list_push(driver.menu->menu_stack, "", "info_screen",
@@ -577,7 +577,7 @@ static int menu_viewport_iterate(unsigned action)
          break;
 
       case MENU_ACTION_CANCEL:
-         menu_entries_pop(driver.menu->menu_stack);
+         menu_entries_pop_list(driver.menu->menu_stack);
          if (!strcmp(label, "custom_viewport_2"))
          {
             file_list_push(driver.menu->menu_stack, "", "",
@@ -587,7 +587,7 @@ static int menu_viewport_iterate(unsigned action)
          break;
 
       case MENU_ACTION_OK:
-         menu_entries_pop(driver.menu->menu_stack);
+         menu_entries_pop_list(driver.menu->menu_stack);
          if (menu_type == MENU_SETTINGS_CUSTOM_VIEWPORT
                && !g_settings.video.scale_integer)
          {
@@ -711,7 +711,7 @@ static int menu_load_or_open_zip_iterate(unsigned action)
       const char* label      = NULL;
       unsigned int menu_type = 0, type = 0;
 
-      menu_entries_pop(driver.menu->menu_stack);
+      menu_entries_pop_list(driver.menu->menu_stack);
 
       file_list_get_last(driver.menu->menu_stack, &menu_path, &menu_label,
             &menu_type);
@@ -734,7 +734,7 @@ static int menu_load_or_open_zip_iterate(unsigned action)
       const char* label       = NULL;
       unsigned int menu_type = 0, type = 0;
 
-      menu_entries_pop(driver.menu->menu_stack);
+      menu_entries_pop_list(driver.menu->menu_stack);
 
       file_list_get_last(driver.menu->menu_stack, &menu_path, &menu_label,
             &menu_type);
@@ -1027,13 +1027,13 @@ static int menu_common_iterate(unsigned action)
    else if (menu_type == MENU_SETTINGS_CUSTOM_BIND)
    {
       if (menu_input_bind_iterate(driver.menu))
-         menu_entries_pop(driver.menu->menu_stack);
+         menu_entries_pop_list(driver.menu->menu_stack);
       return 0;
    }
    else if (menu_type == MENU_SETTINGS_CUSTOM_BIND_KEYBOARD)
    {
       if (menu_input_bind_iterate_keyboard(driver.menu))
-         menu_entries_pop(driver.menu->menu_stack);
+         menu_entries_pop_list(driver.menu->menu_stack);
       return 0;
    }
 
@@ -1088,7 +1088,7 @@ static int menu_common_iterate(unsigned action)
          break;
 
       case MENU_ACTION_CANCEL:
-         menu_entries_pop(driver.menu->menu_stack);
+         menu_entries_pop_list(driver.menu->menu_stack);
          break;
 
       case MENU_ACTION_OK:
diff --git a/frontend/menu/menu_entries.c b/frontend/menu/menu_entries.c
index 0e2205ebb1..508f7b8d63 100644
--- a/frontend/menu/menu_entries.c
+++ b/frontend/menu/menu_entries.c
@@ -136,7 +136,7 @@ void menu_entries_push_perfcounter(menu_handle_t *menu,
                id + i, 0);
 }
 
-void menu_entries_pop(file_list_t *list)
+void menu_entries_pop_list(file_list_t *list)
 {
    if (file_list_get_size(list) > 1)
    {
diff --git a/frontend/menu/menu_entries.h b/frontend/menu/menu_entries.h
index 25567b6b0f..ef3bb9d8bd 100644
--- a/frontend/menu/menu_entries.h
+++ b/frontend/menu/menu_entries.h
@@ -30,11 +30,12 @@ int menu_entries_push_list(menu_handle_t *menu,
       file_list_t *list, const char *path,
       const char *label, unsigned menu_type);
 
+void menu_entries_pop_list(file_list_t *list);
+
 int menu_parse_check(const char *label, unsigned menu_type);
 
 int menu_parse_and_resolve(file_list_t *list, file_list_t *menu_list);
 
-void menu_entries_pop(file_list_t *list);
 void menu_entries_pop_stack(file_list_t *list, const char *needle);
 
 void menu_flush_stack_type(file_list_t *list, unsigned final_type);