diff --git a/CHANGELOG.md b/CHANGELOG.md
index 006bacf089..bc9a92d67c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@
 ## Changes
 - Added splash to reader (in case it being opened from shortcut)
 - Increased long strip split height
+- Use normalized app name by default as folder name
 
 ## Fixes
 - Fixed cutout support being broken
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
index dce43c2bc9..94c46d0eaf 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
@@ -69,7 +69,7 @@ class PreferencesHelper(val context: Context, val preferenceStore: PreferenceSto
     private val defaultDownloadsDir = Uri.fromFile(
         File(
             Environment.getExternalStorageDirectory().absolutePath + File.separator +
-                context.getString(R.string.app_name),
+                context.getString(R.string.app_normalized_name),
             "downloads",
         ),
     )
@@ -77,7 +77,7 @@ class PreferencesHelper(val context: Context, val preferenceStore: PreferenceSto
     private val defaultBackupDir = Uri.fromFile(
         File(
             Environment.getExternalStorageDirectory().absolutePath + File.separator +
-                context.getString(R.string.app_name),
+                context.getString(R.string.app_normalized_name),
             "backup",
         ),
     )
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsPresenter.kt
index 87d8b2276b..7cdd4422f9 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsPresenter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsPresenter.kt
@@ -860,14 +860,14 @@ class MangaDetailsPresenter(
             val directory = if (preferences.folderPerManga().get()) {
                 val baseDir = Environment.getExternalStorageDirectory().absolutePath +
                     File.separator + Environment.DIRECTORY_PICTURES +
-                    File.separator + preferences.context.getString(R.string.app_name)
+                    File.separator + preferences.context.getString(R.string.app_normalized_name)
 
                 File(baseDir + File.separator + DiskUtil.buildValidFilename(manga.title))
             } else {
                 File(
                     Environment.getExternalStorageDirectory().absolutePath +
                         File.separator + Environment.DIRECTORY_PICTURES +
-                        File.separator + preferences.context.getString(R.string.app_name),
+                        File.separator + preferences.context.getString(R.string.app_normalized_name),
                 )
             }
             val file = saveCover(directory)
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt
index 510f792ddc..4f75464b7e 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt
@@ -816,7 +816,7 @@ class ReaderViewModel(
         // Pictures directory.
         val baseDir = Environment.getExternalStorageDirectory().absolutePath +
             File.separator + Environment.DIRECTORY_PICTURES +
-            File.separator + context.getString(R.string.app_name)
+            File.separator + context.getString(R.string.app_normalized_name)
         val destDir = if (preferences.folderPerManga().get()) {
             File(baseDir + File.separator + DiskUtil.buildValidFilename(manga.title))
         } else {
@@ -850,7 +850,7 @@ class ReaderViewModel(
             // Pictures directory.
             val baseDir = Environment.getExternalStorageDirectory().absolutePath +
                 File.separator + Environment.DIRECTORY_PICTURES +
-                File.separator + context.getString(R.string.app_name)
+                File.separator + context.getString(R.string.app_normalized_name)
             val destDir = if (preferences.folderPerManga().get()) {
                 File(baseDir + File.separator + DiskUtil.buildValidFilename(manga.title))
             } else {
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsDownloadController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsDownloadController.kt
index 377f994eae..c234c01ebe 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsDownloadController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsDownloadController.kt
@@ -205,7 +205,7 @@ class SettingsDownloadController : SettingsController() {
 
         private fun getExternalDirs(): List<File> {
             val defaultDir = Environment.getExternalStorageDirectory().absolutePath +
-                File.separator + activity.resources?.getString(R.string.app_name) +
+                File.separator + activity.resources?.getString(R.string.app_normalized_name) +
                 File.separator + "downloads"
 
             return mutableListOf(File(defaultDir)) +