diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
index 4c0efedc52..67da6c3d27 100644
--- a/menu/cbs/menu_cbs_ok.c
+++ b/menu/cbs/menu_cbs_ok.c
@@ -1712,7 +1712,7 @@ static void cb_generic_download(void *task_data,
       case MENU_ENUM_LABEL_CB_UPDATE_SHADERS_CG:
       case MENU_ENUM_LABEL_CB_UPDATE_SHADERS_GLSL:
       {
-         char shaderdir[PATH_MAX_LENGTH]       = {0};
+         static char shaderdir[PATH_MAX_LENGTH]       = {0};
          const char *dirname = transf->enum_idx == MENU_ENUM_LABEL_CB_UPDATE_SHADERS_CG ?
                   "shaders_cg" : "shaders_glsl";
 
diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index e8c18f3c70..302aa96752 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -3256,10 +3256,9 @@ static int menu_displaylist_parse_generic(
                      break;
                   }
                default:
+                  file_type = (enum msg_file_type)info->type_default;
                   break;
             }
-
-            file_type = (enum msg_file_type)info->type_default;
             break;
       }