diff --git a/app/src/main/java/org/thunderdog/challegram/component/attach/MediaBottomFilesController.java b/app/src/main/java/org/thunderdog/challegram/component/attach/MediaBottomFilesController.java
index cbde304944..4e26a039c1 100644
--- a/app/src/main/java/org/thunderdog/challegram/component/attach/MediaBottomFilesController.java
+++ b/app/src/main/java/org/thunderdog/challegram/component/attach/MediaBottomFilesController.java
@@ -62,6 +62,7 @@
 import org.thunderdog.challegram.ui.ListItem;
 import org.thunderdog.challegram.ui.SettingsAdapter;
 import org.thunderdog.challegram.util.Permissions;
+import org.thunderdog.challegram.BuildConfig;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -260,7 +261,7 @@ private void navigateToPath (final View view, final String currentPath, final St
     boolean downloadsEmpty = false;
     if (context.permissions().canManageStorage()) {
       try {
-        File file = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS);
+        File file = new File(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS), BuildConfig.PROJECT_NAME);
         if (file.exists() && file.isDirectory()) {
           File[] files = file.listFiles();
           if (files != null && !(downloadsEmpty = files.length == 0)) {
diff --git a/app/src/main/java/org/thunderdog/challegram/data/TD.java b/app/src/main/java/org/thunderdog/challegram/data/TD.java
index 0879d712d1..d865f93496 100644
--- a/app/src/main/java/org/thunderdog/challegram/data/TD.java
+++ b/app/src/main/java/org/thunderdog/challegram/data/TD.java
@@ -4536,7 +4536,7 @@ private static File saveToDownloadsImpl (final DownloadedFile file) {
         break;
       }
       default: {
-        destDir = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS);
+        destDir = new File(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS), BuildConfig.PROJECT_NAME);
         break;
       }
     }
@@ -4595,7 +4595,7 @@ private static void saveToDownloadsImpl (final File sourceFile, final String sou
     if (!sourceFile.exists()) {
       return;
     }
-    final File destDir = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS);
+    final File destDir = new File(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS), BuildConfig.PROJECT_NAME);
     if (!FileUtils.createDirectory(destDir)) {
       return;
     }