diff --git a/configuration.c b/configuration.c
index e53a04f95a..b5520532d0 100644
--- a/configuration.c
+++ b/configuration.c
@@ -4157,7 +4157,7 @@ bool config_save_overrides(int override_type)
    fill_pathname_join(override_directory, config_directory, core_name,
       path_size);
 
-   if (!filestream_exists(override_directory))
+   if (!path_is_directory(override_directory))
        path_mkdir(override_directory);
 
    /* Concatenate strings into full paths for core_path, game_path */
diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
index f25b2beb94..f0278fe870 100644
--- a/menu/cbs/menu_cbs_ok.c
+++ b/menu/cbs/menu_cbs_ok.c
@@ -2442,7 +2442,7 @@ static int generic_action_ok_shader_preset_save(const char *path,
             core_name,
             sizeof(directory));
    }
-   if (!filestream_exists(directory))
+   if (!path_is_directory(directory))
        path_mkdir(directory);
 
    switch (action_type)
@@ -2544,7 +2544,7 @@ static int generic_action_ok_remap_file_operation(const char *path,
          break;
    }
 
-   if (!filestream_exists(directory))
+   if (!path_is_directory(directory))
        path_mkdir(directory);
 
    if (action_type < ACTION_OK_REMAP_FILE_REMOVE_CORE)
@@ -3516,7 +3516,7 @@ void cb_generic_download(retro_task_t *task,
                   dirname,
                   sizeof(shaderdir));
 
-            if (!filestream_exists(shaderdir) && !path_mkdir(shaderdir))
+            if (!path_is_directory(shaderdir) && !path_mkdir(shaderdir))
                goto finish;
 
             dir_path = shaderdir;
diff --git a/ui/drivers/qt/shaderparamsdialog.cpp b/ui/drivers/qt/shaderparamsdialog.cpp
index 397076920c..6d884f954f 100644
--- a/ui/drivers/qt/shaderparamsdialog.cpp
+++ b/ui/drivers/qt/shaderparamsdialog.cpp
@@ -707,7 +707,7 @@ void ShaderParamsDialog::saveShaderPreset(const char *path, unsigned action_type
             sizeof(directory));
    }
 
-   if (!filestream_exists(directory))
+   if (!path_is_directory(directory))
        path_mkdir(directory);
 
    switch (action_type)