diff --git a/dirs.c b/dirs.c
index 1e86cc7285..8cd35725ba 100644
--- a/dirs.c
+++ b/dirs.c
@@ -168,24 +168,24 @@ void dir_check_shader(bool pressed_next, bool pressed_prev)
 
 /* empty functions */
 
-bool dir_is_empty(enum rarch_dir_type type)
+bool dir_is_system_empty(void)
 {
-   switch (type)
-   {
-      case RARCH_DIR_SYSTEM:
-         return string_is_empty(dir_system);
-      case RARCH_DIR_SAVEFILE:
-         return string_is_empty(dir_savefile);
-      case RARCH_DIR_SAVESTATE:
-         return string_is_empty(dir_savestate);
-      case RARCH_DIR_OSK_OVERLAY:
-         return string_is_empty(dir_osk_overlay);
-      case RARCH_DIR_NONE:
-      default:
-         break;
-   }
+   return string_is_empty(dir_savefile);
+}
 
-   return false;
+bool dir_is_savefile_empty(void)
+{
+   return string_is_empty(dir_savefile);
+}
+
+bool dir_is_savestate_empty(void)
+{
+   return string_is_empty(dir_savestate);
+}
+
+bool dir_is_osk_overlay_empty(void)
+{
+   return string_is_empty(dir_osk_overlay);
 }
 
 /* get size functions */
diff --git a/dirs.h b/dirs.h
index 61cfb8178f..f172d04474 100644
--- a/dirs.h
+++ b/dirs.h
@@ -44,7 +44,13 @@ void dir_check_shader(bool pressed_next, bool pressed_prev);
 
 /* empty functions */
 
-bool dir_is_empty(enum rarch_dir_type type);
+bool dir_is_savefile_empty(void);
+
+bool dir_is_savestate_empty(void);
+
+bool dir_is_system_empty(void);
+
+bool dir_is_osk_overlay_empty(void);
 
 /* clear functions */
 
diff --git a/tasks/task_content.c b/tasks/task_content.c
index 6af7313c52..98b6c6c72c 100644
--- a/tasks/task_content.c
+++ b/tasks/task_content.c
@@ -847,9 +847,9 @@ static void menu_content_environment_get(int *argc, char *argv[],
 
    if (!path_is_empty(RARCH_PATH_CONFIG))
       wrap_args->config_path   = path_get(RARCH_PATH_CONFIG);
-   if (!dir_is_empty(RARCH_DIR_SAVEFILE))
+   if (!dir_is_savefile_empty())
       wrap_args->sram_path     = dir_get_savefile();
-   if (!dir_is_empty(RARCH_DIR_SAVESTATE))
+   if (!dir_is_savestate_empty())
       wrap_args->state_path    = dir_get_savestate();
    if (fullpath && *fullpath)
       wrap_args->content_path  = fullpath;