diff --git a/apps/misc.c b/apps/misc.c
index a8710c312f..85ab396754 100644
--- a/apps/misc.c
+++ b/apps/misc.c
@@ -1115,12 +1115,8 @@ bool file_exists(const char *file)
 bool dir_exists(const char *path)
 {
     DIR* d = opendir(path);
-    bool retval;
-    if (d != NULL) {
-        closedir(d);
-        retval = true;
-    } else {
-        retval = false;
-    }
-    return retval;
+    if (!d)
+        return false;
+    closedir(d);
+    return true;
 }
diff --git a/apps/recorder/recording.c b/apps/recorder/recording.c
index 34c2c6c605..c1fe2258d9 100644
--- a/apps/recorder/recording.c
+++ b/apps/recorder/recording.c
@@ -590,17 +590,14 @@ static void adjust_cursor(void)
         cursor = max_cursor;
 }
 
-static bool check_dir(char *folder)
+static bool check_dir(const char *folder)
 {
-    DIR *dir = opendir(folder);
-    if (!dir && strcmp(folder, "/"))
+    if (strcmp(folder, "/") && !dir_exists(folder))
     {
         int rc = mkdir(folder);
         if(rc < 0)
             return false;
-        return true;
     }
-    closedir(dir);
     return true;
 }