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 441c3943d..1ed7e0178 100755
--- 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
@@ -64,23 +64,18 @@ class TrackSearchDialog : DialogController {
 
         // Toolbar stuff
         binding!!.toolbar.setNavigationOnClickListener { dialog?.dismiss() }
-        binding!!.toolbar.setOnMenuItemClickListener {
-            when (it.itemId) {
-                R.id.done -> {
-                    val adapter = adapter ?: return@setOnMenuItemClickListener true
-                    val item = adapter.items.getOrNull(adapter.selectedItemPosition)
-                    if (item != null) {
-                        trackController.presenter.registerTracking(item, service)
-                        dialog?.dismiss()
-                    }
-                }
+        binding!!.trackBtn.setOnClickListener {
+            val adapter = adapter ?: return@setOnClickListener
+            val item = adapter.items.getOrNull(adapter.selectedItemPosition)
+            if (item != null) {
+                trackController.presenter.registerTracking(item, service)
+                dialog?.dismiss()
             }
-            true
         }
 
         // Create adapter
         adapter = TrackSearchAdapter(currentTrackUrl) { which ->
-            binding!!.toolbar.menu.findItem(R.id.done).isEnabled = which != null
+            binding!!.trackBtn.isEnabled = which != null
         }
         binding!!.trackSearchRecyclerview.adapter = adapter
 
@@ -142,6 +137,11 @@ class TrackSearchDialog : DialogController {
                 margin(horizontal = true)
             }
         }
+        binding!!.trackBtn.applyInsetter {
+            type(navigationBars = true) {
+                margin()
+            }
+        }
 
         return AppCompatDialog(activity!!, R.style.ThemeOverlay_Tachiyomi_Dialog_Fullscreen).apply {
             setContentView(binding!!.root)
diff --git a/app/src/main/res/layout/track_search_dialog.xml b/app/src/main/res/layout/track_search_dialog.xml
index 8cb6d1ac8..315efbc86 100755
--- a/app/src/main/res/layout/track_search_dialog.xml
+++ b/app/src/main/res/layout/track_search_dialog.xml
@@ -17,7 +17,6 @@
             android:layout_height="?attr/actionBarSize"
             android:theme="?attr/actionBarTheme"
             app:contentInsetStartWithNavigation="0dp"
-            app:menu="@menu/track_search"
             app:navigationIcon="@drawable/ic_close_24dp"
             app:title="@string/add_tracking" />
 
@@ -86,6 +85,15 @@
 
         </FrameLayout>
 
+        <Button
+            android:id="@+id/track_btn"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="16dp"
+            android:layout_marginVertical="4dp"
+            android:text="@string/action_track"
+            android:enabled="false" />
+
     </LinearLayout>
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f8786f773..5cc5a36c0 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -400,6 +400,7 @@
     <string name="tracking_info">One-way sync to update the chapter progress in tracking services. Set up tracking for individual manga entries from their tracking button.</string>
     <string name="enhanced_services">Enhanced services</string>
     <string name="enhanced_tracking_info">Services that provide enhanced features for specific sources. Manga are automatically tracked when added to your library.</string>
+    <string name="action_track">Track</string>
 
       <!-- Browse section -->
     <string name="pref_enable_automatic_extension_updates">Check for extension updates</string>