diff --git a/app/src/main/java/com/github/libretube/ui/dialogs/SubmitDeArrowDialog.kt b/app/src/main/java/com/github/libretube/ui/dialogs/SubmitDeArrowDialog.kt
index d512a595a..28a0bbd4a 100644
--- a/app/src/main/java/com/github/libretube/ui/dialogs/SubmitDeArrowDialog.kt
+++ b/app/src/main/java/com/github/libretube/ui/dialogs/SubmitDeArrowDialog.kt
@@ -3,6 +3,7 @@ package com.github.libretube.ui.dialogs
 import android.app.Dialog
 import android.content.DialogInterface
 import android.os.Bundle
+import android.widget.CompoundButton
 import androidx.fragment.app.DialogFragment
 import androidx.lifecycle.lifecycleScope
 import com.github.libretube.R
@@ -41,13 +42,6 @@ class SubmitDeArrowDialog: DialogFragment() {
         binding.dearrowTitle.typingEnabled = true
         binding.thumbnailTime.setText(currentPosition.toString())
 
-        binding.titleCheckbox.setOnCheckedChangeListener { _, isChecked ->
-            binding.dearrowTitle.isEnabled = isChecked
-        }
-        binding.thumbnailTimeCheckbox.setOnCheckedChangeListener { _, isChecked ->
-            binding.thumbnailTimeInputLayout.isEnabled = isChecked
-        }
-
         lifecycleScope.launch { fetchDeArrowData() }
 
         return MaterialAlertDialogBuilder(requireContext())
@@ -56,7 +50,19 @@ class SubmitDeArrowDialog: DialogFragment() {
             .setNegativeButton(R.string.cancel, null)
             .show()
             .apply {
-                getButton(DialogInterface.BUTTON_POSITIVE).setOnClickListener {
+                val positiveButton = getButton(DialogInterface.BUTTON_POSITIVE)
+                positiveButton.isEnabled = false
+
+                binding.titleCheckbox.setOnCheckedChangeListener { _, isChecked ->
+                    binding.dearrowTitle.isEnabled = isChecked
+                    positiveButton.isEnabled = isChecked || binding.thumbnailTimeCheckbox.isChecked
+                }
+                binding.thumbnailTimeCheckbox.setOnCheckedChangeListener { _, isChecked ->
+                    binding.thumbnailTimeInputLayout.isEnabled = isChecked
+                    positiveButton.isEnabled = binding.titleCheckbox.isChecked || isChecked
+                }
+
+                positiveButton.setOnClickListener {
                     lifecycleScope.launch { submitDeArrow() }
                 }
             }
diff --git a/app/src/main/res/layout/dialog_submit_dearrow.xml b/app/src/main/res/layout/dialog_submit_dearrow.xml
index 233650085..83f5a28a2 100644
--- a/app/src/main/res/layout/dialog_submit_dearrow.xml
+++ b/app/src/main/res/layout/dialog_submit_dearrow.xml
@@ -24,7 +24,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="10dp"
-            android:checked="true"
+            android:checked="false"
             android:text="@string/title" />
 
         <com.google.android.material.checkbox.MaterialCheckBox
@@ -47,13 +47,13 @@
         android:id="@+id/thumbnail_time_input_layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:enabled="false"
         android:hint="@string/thumbnail_time">
 
         <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/thumbnail_time"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:enabled="false"
             android:inputType="numberDecimal" />
     </com.google.android.material.textfield.TextInputLayout>