diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
index 7ba3ce67d8..e49c2fb75b 100644
--- a/menu/cbs/menu_cbs_ok.c
+++ b/menu/cbs/menu_cbs_ok.c
@@ -1574,7 +1574,7 @@ static int action_ok_lookup_setting(const char *path,
 static int action_ok_menu_wallpaper(const char *path,
       const char *label, unsigned type, size_t idx, size_t entry_idx)
 {
-   filebrowser_set_type(FILEBROWSER_SELECT_FILE);
+   filebrowser_set_type(FILEBROWSER_SELECT_IMAGE);
    return action_ok_lookup_setting(path, label, type, idx, entry_idx);
 }
 
diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index c9570ac6cc..705777b11f 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -6533,7 +6533,8 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
          strlcpy(info->exts, "filt", sizeof(info->exts));
          break;
       case DISPLAYLIST_IMAGES:
-         if (filebrowser_get_type() != FILEBROWSER_SELECT_FILE)
+         if (     (filebrowser_get_type() != FILEBROWSER_SELECT_FILE)
+               && (filebrowser_get_type() != FILEBROWSER_SELECT_IMAGE))
             filebrowser_clear_type();
          info->type_default = FILE_TYPE_IMAGE;
          {
diff --git a/menu/widgets/menu_filebrowser.c b/menu/widgets/menu_filebrowser.c
index 9966df0351..8dfe66c996 100644
--- a/menu/widgets/menu_filebrowser.c
+++ b/menu/widgets/menu_filebrowser.c
@@ -49,7 +49,9 @@ void filebrowser_clear_type(void)
 
 void filebrowser_set_type(enum filebrowser_enums type)
 {
-   if (filebrowser_types != FILEBROWSER_SELECT_FILE)
+   if (   (filebrowser_types != FILEBROWSER_SELECT_FILE)
+       && (filebrowser_types != FILEBROWSER_SELECT_IMAGE)
+       )
       filebrowser_types = type;
 }
 
@@ -206,7 +208,7 @@ void filebrowser_parse(void *data, unsigned type_data)
                   else
                      file_type = FILE_TYPE_IMAGE;
 #endif
-                  if (filebrowser_types == FILEBROWSER_SELECT_FILE)
+                  if (filebrowser_types == FILEBROWSER_SELECT_IMAGE)
                      file_type = FILE_TYPE_IMAGE;
                   break;
                default:
diff --git a/menu/widgets/menu_filebrowser.h b/menu/widgets/menu_filebrowser.h
index c1d3794b59..26c6101bf0 100644
--- a/menu/widgets/menu_filebrowser.h
+++ b/menu/widgets/menu_filebrowser.h
@@ -30,6 +30,7 @@ enum filebrowser_enums
    FILEBROWSER_SELECT_DIR,
    FILEBROWSER_SCAN_DIR,
    FILEBROWSER_SELECT_FILE,
+   FILEBROWSER_SELECT_IMAGE,
    FILEBROWSER_SELECT_COLLECTION
 };