diff --git a/app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentManager.java b/app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentManager.java
index b0c907b05..fe79a81a9 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentManager.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentManager.java
@@ -448,7 +448,7 @@ public class AttachmentManager {
                      if (address != null) {
                        Intent intent = new Intent(fragment.requireContext(), PaymentsActivity.class);
                        intent.putExtra(PaymentsActivity.EXTRA_PAYMENTS_STARTING_ACTION, R.id.action_directly_to_createPayment);
-                       intent.putExtra(PaymentsActivity.EXTRA_STARTING_ARGUMENTS, new CreatePaymentFragmentArgs.Builder(new PayeeParcelable(recipient.getId())).build().toBundle());
+                       intent.putExtra(PaymentsActivity.EXTRA_STARTING_ARGUMENTS, new CreatePaymentFragmentArgs.Builder(new PayeeParcelable(recipient.getId())).setFinishOnConfirm(true).build().toBundle());
                        fragment.startActivity(intent);
                      } else if (FeatureFlags.paymentsRequestActivateFlow()) {
                        showRequestToActivatePayments(fragment.requireContext(), recipient);
diff --git a/app/src/main/res/navigation/payments_preferences.xml b/app/src/main/res/navigation/payments_preferences.xml
index 8d0c8798c..bd941fdb6 100644
--- a/app/src/main/res/navigation/payments_preferences.xml
+++ b/app/src/main/res/navigation/payments_preferences.xml
@@ -243,6 +243,11 @@
             app:argType="string"
             app:nullable="true" />
 
+        <argument
+            android:name="finish_on_confirm"
+            app:argType="boolean"
+            android:defaultValue="false" />
+
     </action>
 
     <action