diff --git a/firmware/common/dir_uncached.c b/firmware/common/dir_uncached.c
index e036c95840..1de81bd79e 100644
--- a/firmware/common/dir_uncached.c
+++ b/firmware/common/dir_uncached.c
@@ -27,7 +27,11 @@
 #include "dir.h"
 #include "debug.h"
 
+#if ((defined(MEMORYSIZE) && (MEMORYSIZE > 8)) || MEM > 8)
+#define MAX_OPEN_DIRS 16
+#else
 #define MAX_OPEN_DIRS 8
+#endif
 
 static DIR_UNCACHED opendirs[MAX_OPEN_DIRS];
 
diff --git a/firmware/common/dircache.c b/firmware/common/dircache.c
index 313102b9a1..4eb97ce3da 100644
--- a/firmware/common/dircache.c
+++ b/firmware/common/dircache.c
@@ -49,7 +49,11 @@
 #define DIRCACHE_BUILD 1
 #define DIRCACHE_STOP  2
 
+#if ((defined(MEMORYSIZE) && (MEMORYSIZE > 8)) || MEM > 8)
+#define MAX_OPEN_DIRS 16
+#else
 #define MAX_OPEN_DIRS 8
+#endif
 static DIR_CACHED opendirs[MAX_OPEN_DIRS];
 
 static struct dircache_entry *fd_bindings[MAX_OPEN_FILES];