diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
index 756507a800..42abd9ae79 100644
--- a/menu/cbs/menu_cbs_ok.c
+++ b/menu/cbs/menu_cbs_ok.c
@@ -1645,7 +1645,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_IMAGE);
+   filebrowser_set_type(FILEBROWSER_SELECT_FILE);
    return action_ok_lookup_setting(path, label, type, idx, entry_idx);
 }
 
diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index de58bf7eaa..717c292650 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -6171,7 +6171,7 @@ 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_IMAGE)
+         if (filebrowser_get_type() != FILEBROWSER_SELECT_FILE)
             filebrowser_clear_type();
          info->type_default = FILE_TYPE_IMAGE;
          {
diff --git a/menu/widgets/menu_filebrowser.c b/menu/widgets/menu_filebrowser.c
index 379d2357f7..056b956875 100644
--- a/menu/widgets/menu_filebrowser.c
+++ b/menu/widgets/menu_filebrowser.c
@@ -35,10 +35,6 @@
 #include "../../configuration.h"
 #include "../../paths.h"
 
-#if 0
-#define FILEBROWSER_DEBUG
-#endif
-
 static enum filebrowser_enums filebrowser_types = FILEBROWSER_NONE;
 
 enum filebrowser_enums filebrowser_get_type(void)
@@ -48,24 +44,13 @@ enum filebrowser_enums filebrowser_get_type(void)
 
 void filebrowser_clear_type(void)
 {
-#ifdef FILEBROWSER_DEBUG
-   RARCH_LOG("filebrowser_clear_type \n");
-#endif
    filebrowser_types = FILEBROWSER_NONE;
 }
 
 void filebrowser_set_type(enum filebrowser_enums type)
 {
-#ifdef FILEBROWSER_DEBUG
-   RARCH_LOG("filebrowser_set_type: %d \n", type);
-#endif
-   if (filebrowser_types != FILEBROWSER_SELECT_IMAGE)
-   {
+   if (filebrowser_types != FILEBROWSER_SELECT_FILE)
       filebrowser_types = type;
-#ifdef FILEBROWSER_DEBUG
-      RARCH_LOG("filebrowser_set_type MODIFIED: %d \n", type);
-#endif
-   }
 }
 
 void filebrowser_parse(void *data, unsigned type_data, bool extensions_honored)
@@ -224,7 +209,7 @@ void filebrowser_parse(void *data, unsigned type_data, bool extensions_honored)
                   else
                      file_type = FILE_TYPE_IMAGE;
 #endif
-                  if (filebrowser_types == FILEBROWSER_SELECT_IMAGE)
+                  if (filebrowser_types == FILEBROWSER_SELECT_FILE)
                      file_type = FILE_TYPE_IMAGE;
                   break;
                default:
diff --git a/menu/widgets/menu_filebrowser.h b/menu/widgets/menu_filebrowser.h
index c75754d4ef..4ccd45f2c7 100644
--- a/menu/widgets/menu_filebrowser.h
+++ b/menu/widgets/menu_filebrowser.h
@@ -31,7 +31,7 @@ enum filebrowser_enums
    FILEBROWSER_NONE              = 0,
    FILEBROWSER_SELECT_DIR,
    FILEBROWSER_SCAN_DIR,
-   FILEBROWSER_SELECT_IMAGE,
+   FILEBROWSER_SELECT_FILE,
    FILEBROWSER_SELECT_COLLECTION
 };