diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/adapters/DirectoryAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/adapters/DirectoryAdapter.kt
index afab96942..f1eb345d3 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/adapters/DirectoryAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/adapters/DirectoryAdapter.kt
@@ -6,6 +6,7 @@ import android.content.pm.ShortcutInfo
 import android.content.pm.ShortcutManager
 import android.graphics.drawable.ColorDrawable
 import android.graphics.drawable.Icon
+import android.text.TextUtils
 import android.view.Menu
 import android.view.View
 import android.view.ViewGroup
@@ -720,6 +721,11 @@ class DirectoryAdapter(activity: BaseSimpleActivity, var dirs: ArrayList<Directo
             photo_cnt.text = directory.subfoldersMediaCount.toString()
             photo_cnt.beVisibleIf(showMediaCount == FOLDER_MEDIA_CNT_LINE)
 
+            if (config.limitFolderTitle) {
+                dir_name.setSingleLine()
+                dir_name.ellipsize = TextUtils.TruncateAt.MIDDLE
+            }
+
             var nameCount = directory.name
             if (showMediaCount == FOLDER_MEDIA_CNT_BRACKETS) {
                 nameCount += " (${directory.subfoldersMediaCount})"
diff --git a/app/src/main/res/layout/directory_item_grid_rounded_corners.xml b/app/src/main/res/layout/directory_item_grid_rounded_corners.xml
index e59014668..0a6b516ff 100644
--- a/app/src/main/res/layout/directory_item_grid_rounded_corners.xml
+++ b/app/src/main/res/layout/directory_item_grid_rounded_corners.xml
@@ -62,9 +62,7 @@
         android:layout_below="@+id/dir_thumbnail"
         android:layout_alignStart="@+id/dir_thumbnail"
         android:layout_toStartOf="@+id/dir_location"
-        android:ellipsize="middle"
         android:paddingTop="@dimen/medium_margin"
-        android:singleLine="true"
         android:textColor="@android:color/white"
         android:textSize="@dimen/normal_text_size"
         tools:text="Camera" />
diff --git a/app/src/main/res/layout/directory_item_grid_square.xml b/app/src/main/res/layout/directory_item_grid_square.xml
index d7b84af77..216398756 100644
--- a/app/src/main/res/layout/directory_item_grid_square.xml
+++ b/app/src/main/res/layout/directory_item_grid_square.xml
@@ -83,8 +83,6 @@
             android:id="@+id/dir_name"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:ellipsize="end"
-            android:maxLines="2"
             android:paddingBottom="@dimen/small_margin"
             android:shadowColor="@color/default_background_color"
             android:shadowRadius="4"