diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/RenameDirectoryDialog.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/RenameDirectoryDialog.kt
index 036272dfa..2e09b1921 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/RenameDirectoryDialog.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/RenameDirectoryDialog.kt
@@ -40,6 +40,11 @@ class RenameDirectoryDialog(val activity: SimpleActivity, val dir: File, val lis
                 updatedFiles.add(dir.absolutePath)
                 val newDir = File(dir.parent, newDirName)
 
+                if (newDir.exists()) {
+                    context.toast(R.string.rename_folder_exists)
+                    return@setOnClickListener
+                }
+
                 if (context.needsStupidWritePermissions(dir.absolutePath)) {
                     if (activity.isShowingPermDialog(dir))
                         return@setOnClickListener
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 3aa3eff8a..c327681c1 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -15,6 +15,7 @@
     <string name="rename_file_error">Konnte die Datei nicht umbenennen</string>
     <string name="rename_folder_error">Konnte den Ordner nicht umbenennen</string>
     <string name="rename_folder_empty">Ordnername darf nicht leer sein</string>
+    <string name="rename_folder_exists">A folder with that name already exists</string>
     <string name="rename_folder_ok">Ordner erfolgreich umbenannt</string>
     <string name="renaming_folder">Benenne Ordner um</string>
     <string name="filename_cannot_be_empty">Dateiname darf nicht leer sein</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 78b6bc5c5..5afbc5261 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -15,6 +15,7 @@
     <string name="rename_file_error">No se pudo renombrar el archivo</string>
     <string name="rename_folder_error">No se pudo renombrar la carpeta</string>
     <string name="rename_folder_empty">El nombre de carpeta no puede estar vacío</string>
+    <string name="rename_folder_exists">A folder with that name already exists</string>
     <string name="rename_folder_ok">Carpeta renombrada correctamente</string>
     <string name="renaming_folder">Renombrando carpeta</string>
     <string name="filename_cannot_be_empty">El nombre de archivo no puede estar vacío</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 267edc6fb..f4d4d1135 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -15,6 +15,7 @@
     <string name="rename_file_error">Impossibile rinominare il file</string>
     <string name="rename_folder_error">Impossibile rinominare la cartella</string>
     <string name="rename_folder_empty">Il nome della cartella non deve essere vuoto</string>
+    <string name="rename_folder_exists">A folder with that name already exists</string>
     <string name="rename_folder_ok">Cartella rinominata correttamente</string>
     <string name="renaming_folder">Rinominazione cartella</string>
     <string name="filename_cannot_be_empty">Il nome del file non deve essere vuoto</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 8adab01c0..f52d9507e 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -15,6 +15,7 @@
     <string name="rename_file_error">ファイルの名前を変更できませんでした</string>
     <string name="rename_folder_error">フォルダーの名前を変更できませんでした</string>
     <string name="rename_folder_empty">フォルダー名は空にできません</string>
+    <string name="rename_folder_exists">A folder with that name already exists</string>
     <string name="rename_folder_ok">フォルダーの名前を正常に変更しました</string>
     <string name="renaming_folder">フォルダーの名前を変更中</string>
     <string name="filename_cannot_be_empty">ファイル名は空にできません</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 7a7b4e29b..3fc2acf6f 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -15,6 +15,7 @@
     <string name="rename_file_error">Não foi possível renomear o ficheiro</string>
     <string name="rename_folder_error">Não foi possível renomear a pasta</string>
     <string name="rename_folder_empty">O nome da pasta não pode estar vazio</string>
+    <string name="rename_folder_exists">A folder with that name already exists</string>
     <string name="rename_folder_ok">A pasta foi renomeada com sucesso</string>
     <string name="renaming_folder">A renomear pasta</string>
     <string name="filename_cannot_be_empty">O nome do ficheiro não pode estar vazio</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 8cd94a06d..d5f86d17c 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -15,6 +15,7 @@
     <string name="rename_file_error">Det gick inte att döpa om filen</string>
     <string name="rename_folder_error">Det gick inte att döpa om mappen</string>
     <string name="rename_folder_empty">Du måste ange ett mappnamn</string>
+    <string name="rename_folder_exists">A folder with that name already exists</string>
     <string name="rename_folder_ok">Mappen döptes om</string>
     <string name="renaming_folder">Döper om mappen</string>
     <string name="filename_cannot_be_empty">Du måste ange ett filnamn</string>
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index 3f40ecd82..a08602d3f 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -15,6 +15,7 @@
     <string name="rename_file_error">文件不能重命名</string>
     <string name="rename_folder">重命名文件夹</string>
     <string name="rename_folder_empty">文件夹名不能为空</string>
+    <string name="rename_folder_exists">A folder with that name already exists</string>
     <string name="rename_folder_error">文件夹不能重命名</string>
     <string name="rename_folder_ok">文件夹重命名成功</string>
     <string name="renaming_folder">重命名中..</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 16060633e..e1c084cef 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -15,6 +15,7 @@
     <string name="rename_file_error">Could not rename the file</string>
     <string name="rename_folder_error">Could not rename the folder</string>
     <string name="rename_folder_empty">Folder name must not be empty</string>
+    <string name="rename_folder_exists">A folder with that name already exists</string>
     <string name="rename_folder_ok">Folder renamed successfully</string>
     <string name="renaming_folder">Renaming folder</string>
     <string name="filename_cannot_be_empty">Filename cannot be empty</string>