diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/notifications/CustomNotificationsDialogFragment.java b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/notifications/CustomNotificationsDialogFragment.java
index 315ca680f5..44e6303a86 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/notifications/CustomNotificationsDialogFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/notifications/CustomNotificationsDialogFragment.java
@@ -101,7 +101,7 @@ public class CustomNotificationsDialogFragment extends DialogFragment {
 
     Toolbar toolbar = view.findViewById(R.id.custom_notifications_toolbar);
 
-    toolbar.setNavigationOnClickListener(v -> requireActivity().finish());
+    toolbar.setNavigationOnClickListener(v -> dismissAllowingStateLoss());
 
     CompoundButton.OnCheckedChangeListener onCustomNotificationsSwitchCheckChangedListener = (buttonView, isChecked) -> {
       viewModel.setHasCustomNotifications(isChecked);