diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackSearchDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackSearchDialog.kt
index 6a9f8ad8e7..1534f1cd63 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackSearchDialog.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackSearchDialog.kt
@@ -17,10 +17,10 @@ import java.util.concurrent.TimeUnit
 import kotlinx.android.synthetic.main.track_search_dialog.view.progress
 import kotlinx.android.synthetic.main.track_search_dialog.view.track_search
 import kotlinx.android.synthetic.main.track_search_dialog.view.track_search_list
+import kotlinx.coroutines.FlowPreview
 import kotlinx.coroutines.flow.debounce
 import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.flow.launchIn
-import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.onEach
 import reactivecircus.flowbinding.android.widget.itemClicks
 import reactivecircus.flowbinding.android.widget.textChanges
@@ -96,13 +96,13 @@ class TrackSearchDialog : DialogController {
         adapter = null
     }
 
+    @FlowPreview
     override fun onAttach(view: View) {
         super.onAttach(view)
         dialogView!!.track_search.textChanges()
             .debounce(TimeUnit.SECONDS.toMillis(1))
-            .map { it.toString() }
             .filter { it.isNotBlank() }
-            .onEach { search(it) }
+            .onEach { search(it.toString()) }
             .launchIn(trackController.scope)
     }
 
diff --git a/app/src/main/res/layout/track_search_dialog.xml b/app/src/main/res/layout/track_search_dialog.xml
index a2cfb8fc16..a46e08e141 100644
--- a/app/src/main/res/layout/track_search_dialog.xml
+++ b/app/src/main/res/layout/track_search_dialog.xml
@@ -52,8 +52,6 @@
             android:footerDividersEnabled="true"
             android:headerDividersEnabled="true"
             android:listSelector="@drawable/list_item_selector"
-            android:paddingTop="4dp"
-            android:paddingBottom="4dp"
             android:scrollbars="none"
             android:visibility="invisible"
             tools:listitem="@layout/track_search_item"
@@ -61,9 +59,4 @@
 
     </FrameLayout>
 
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="?android:attr/divider" />
-
 </LinearLayout>
diff --git a/app/src/main/res/layout/track_search_item.xml b/app/src/main/res/layout/track_search_item.xml
index 916dc5e29d..7daacc99eb 100644
--- a/app/src/main/res/layout/track_search_item.xml
+++ b/app/src/main/res/layout/track_search_item.xml
@@ -3,6 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     style="@style/Theme.Widget.CardView.Item"
+    android:layout_margin="0dp"
     android:padding="0dp">
 
     <androidx.constraintlayout.widget.ConstraintLayout
@@ -16,10 +17,6 @@
             android:id="@+id/track_search_cover"
             android:layout_width="135dp"
             android:layout_height="match_parent"
-            android:layout_marginStart="8dp"
-            android:layout_marginTop="8dp"
-            android:layout_marginEnd="8dp"
-            android:layout_marginBottom="8dp"
             android:contentDescription="@string/description_cover"
             android:scaleType="centerCrop"
             app:layout_constraintBottom_toBottomOf="parent"
@@ -32,7 +29,7 @@
             android:id="@+id/track_search_title"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
+            android:layout_marginStart="16dp"
             android:layout_marginTop="8dp"
             android:layout_marginEnd="8dp"
             android:maxLines="3"
@@ -47,7 +44,7 @@
             android:id="@+id/track_search_type"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
+            android:layout_marginStart="16dp"
             android:maxLines="1"
             android:text="@string/track_type"
             android:textAppearance="@style/TextAppearance.Regular.Body1.Bold"
@@ -71,7 +68,7 @@
             android:id="@+id/track_search_start"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
+            android:layout_marginStart="16dp"
             android:maxLines="1"
             android:text="@string/track_start_date"
             android:textAppearance="@style/TextAppearance.Regular.Body1.Bold"
@@ -95,7 +92,7 @@
             android:id="@+id/track_search_status"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
+            android:layout_marginStart="16dp"
             android:maxLines="1"
             android:text="@string/track_status"
             android:textAppearance="@style/TextAppearance.Regular.Body1.Bold"
@@ -119,9 +116,9 @@
             android:id="@+id/track_search_summary"
             android:layout_width="0dp"
             android:layout_height="0dp"
-            android:layout_marginStart="8dp"
+            android:layout_marginStart="16dp"
             android:layout_marginTop="8dp"
-            android:layout_marginEnd="8dp"
+            android:layout_marginEnd="16dp"
             android:layout_marginBottom="8dp"
             android:ellipsize="end"
             android:maxLines="7"
@@ -135,13 +132,6 @@
             app:layout_constraintVertical_bias="0.333"
             tools:text="This is the summary of the manga that fits This is the summary of the manga that fits This is the summary of the manga that fits This is the summary of the manga that fits This is the summary of the manga that fits This is the summary of the manga that fits This is the summary of the manga that fits " />
 
-        <androidx.constraintlayout.widget.Guideline
-            android:id="@+id/guideline"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            app:layout_constraintGuide_begin="150dp" />
-
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 </androidx.cardview.widget.CardView>