diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
index 5665516744..028abdbae2 100644
--- a/menu/cbs/menu_cbs_ok.c
+++ b/menu/cbs/menu_cbs_ok.c
@@ -511,7 +511,7 @@ static int file_load_with_detect_core_wrapper(size_t idx, size_t entry_idx,
    switch (ret)
    {
       case -1:
-         task_push_content_load_default(new_core_path, NULL,
+         task_push_content_load_default(new_core_path, def_info.s,
                   &content_info, CORE_TYPE_PLAIN,
                   CONTENT_MODE_LOAD_CONTENT_WITH_NEW_CORE_FROM_MENU,
                   NULL, NULL);
@@ -2368,7 +2368,7 @@ static int action_ok_load_archive_detect_core(const char *path,
    switch (ret)
    {
       case -1:
-         task_push_content_load_default(new_core_path, NULL,
+         task_push_content_load_default(new_core_path, def_info.s,
                   &content_info,
                   CORE_TYPE_PLAIN,
                   CONTENT_MODE_LOAD_CONTENT_WITH_NEW_CORE_FROM_MENU,
diff --git a/menu/menu_content.c b/menu/menu_content.c
index 4f0d18a5d8..9c7485c105 100644
--- a/menu/menu_content.c
+++ b/menu/menu_content.c
@@ -125,7 +125,8 @@ error:
  * selection needs to be made from a list, otherwise
  * returns true and fills in @s with path to core.
  **/
-bool menu_content_find_first_core(menu_content_ctx_defer_info_t *def_info, bool load_content_with_current_core,
+bool menu_content_find_first_core(menu_content_ctx_defer_info_t *def_info,
+      bool load_content_with_current_core,
       char *new_core_path, size_t len)
 {
    const core_info_t *info                 = NULL;
@@ -187,8 +188,6 @@ bool menu_content_find_first_core(menu_content_ctx_defer_info_t *def_info, bool
     if (info)
       strlcpy(new_core_path, info->path, len);
 
-   runloop_ctl(RUNLOOP_CTL_SET_CONTENT_PATH, def_info->s);
-
    return true;
 }