diff --git a/menu/menu_entries_cbs_cancel.c b/menu/menu_entries_cbs_cancel.c
index af5da0b8cd..4630901698 100644
--- a/menu/menu_entries_cbs_cancel.c
+++ b/menu/menu_entries_cbs_cancel.c
@@ -16,7 +16,7 @@
 #include <file/file_path.h>
 #include "menu.h"
 #include "menu_entries_cbs.h"
-#include "menu_list.h"
+#include "menu_entry.h"
 #include "menu_setting.h"
 
 static int action_cancel_lookup_setting(const char *path,
@@ -28,13 +28,7 @@ static int action_cancel_lookup_setting(const char *path,
 static int action_cancel_pop_default(const char *path,
       const char *label, unsigned type, size_t idx)
 {
-   menu_list_t *menu_list = menu_list_get_ptr();
-   if (!menu_list)
-      return -1;
-
-   menu_apply_deferred_settings();
-   menu_list_pop_stack(menu_list);
-   return 0;
+   return menu_entries_select_back();
 }
 
 void menu_entries_cbs_init_bind_cancel(menu_file_list_cbs_t *cbs,
diff --git a/menu/menu_entry.c b/menu/menu_entry.c
index 454b9f7556..94ca9f147e 100644
--- a/menu/menu_entry.c
+++ b/menu/menu_entry.c
@@ -78,15 +78,17 @@ uint32_t menu_entries_show_back(void)
    return (menu_list_get_stack_size(menu->menu_list) > 1);
 }
 
-// Clicks the back button
-void menu_entries_select_back(void)
+/* Clicks the back button */
+int menu_entries_select_back(void)
 {
   menu_list_t *menu_list = menu_list_get_ptr();
   if (!menu_list)
-    return;
+    return -1;
   
   menu_apply_deferred_settings();
   menu_list_pop_stack(menu_list);
+
+  return 0;
 }
 
 // Sets title_msg to the name of the current core (shown at the top of the UI)
diff --git a/menu/menu_entry.h b/menu/menu_entry.h
index c9730f09d2..68d69a9d54 100644
--- a/menu/menu_entry.h
+++ b/menu/menu_entry.h
@@ -55,7 +55,7 @@ void menu_entries_get_title(char *title, size_t title_len);
 
 uint32_t menu_entries_show_back(void);
 
-void menu_entries_select_back(void);
+int menu_entries_select_back(void);
 
 void menu_entries_get_core_title(char *title_msg, size_t title_msg_len);