diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 000000000..e0f15db2e
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "java.configuration.updateBuildConfiguration": "automatic"
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/amaze/filemanager/adapters/CompressedExplorerAdapter.java b/app/src/main/java/com/amaze/filemanager/adapters/CompressedExplorerAdapter.java
index eab01ab74..f41c5be99 100644
--- a/app/src/main/java/com/amaze/filemanager/adapters/CompressedExplorerAdapter.java
+++ b/app/src/main/java/com/amaze/filemanager/adapters/CompressedExplorerAdapter.java
@@ -220,8 +220,7 @@ public class CompressedExplorerAdapter extends RecyclerView.Adapter<CompressedIt
 
     boolean enableMarquee =
         sharedPrefs.getBoolean(PreferencesConstants.PREFERENCE_ENABLE_MARQUEE_FILENAME, true);
-    holder.txtTitle.setEllipsize(
-        enableMarquee ? TextUtils.TruncateAt.MARQUEE : TextUtils.TruncateAt.MIDDLE);
+    AnimUtils.configureTitleMarquee(holder.firstLine, enableMarquee);
 
     final CompressedObjectParcelable rowItem = items.get(position);
     GradientDrawable gradientDrawable = (GradientDrawable) holder.genericIcon.getBackground();
diff --git a/app/src/main/java/com/amaze/filemanager/adapters/RecyclerAdapter.java b/app/src/main/java/com/amaze/filemanager/adapters/RecyclerAdapter.java
index 1200776f1..ee97f57f3 100644
--- a/app/src/main/java/com/amaze/filemanager/adapters/RecyclerAdapter.java
+++ b/app/src/main/java/com/amaze/filemanager/adapters/RecyclerAdapter.java
@@ -765,8 +765,7 @@ public class RecyclerAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
             mainFragment.adjustListViewForTv(holder, mainFragment.getMainActivity());
           }
         });
-    holder.txtTitle.setEllipsize(
-        enableMarquee ? TextUtils.TruncateAt.MARQUEE : TextUtils.TruncateAt.MIDDLE);
+    AnimUtils.configureTitleMarquee(holder.txtTitle, enableMarquee);
 
     final boolean isBackButton = getItemsDigested().get(position).specialType == TYPE_BACK;
     if (isBackButton) {
diff --git a/app/src/test/java/com/amaze/filemanager/utils/AnimUtilsTest.java b/app/src/test/java/com/amaze/filemanager/utils/AnimUtilsTest.java
index 92b65fdc2..77013503d 100644
--- a/app/src/test/java/com/amaze/filemanager/utils/AnimUtilsTest.java
+++ b/app/src/test/java/com/amaze/filemanager/utils/AnimUtilsTest.java
@@ -71,4 +71,19 @@ public class AnimUtilsTest {
     ShadowLooper.runUiThreadTasksIncludingDelayedTasks();
     assertTrue(mock.isSelected());
   }
+
+  @Test
+  public static void configureTitleMarquee(TextView textView, boolean enableMarquee) {
+    if (enableMarquee) {
+        textView.setSingleLine(true);
+        textView.setEllipsize(TextUtils.TruncateAt.MARQUEE);
+        textView.setSelected(true); // Required for Marquee to move
+    } else {
+        // New custom behavior: Double line wrap!
+        textView.setSingleLine(false);
+        textView.setMaxLines(2);
+        textView.setEllipsize(TextUtils.TruncateAt.END);
+        textView.setSelected(false);
+    }
 }
+}
\ No newline at end of file