diff --git a/app/src/main/java/org/thoughtcrime/securesms/delete/DeleteAccountViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/delete/DeleteAccountViewModel.kt
index 7a2bd3d453..d030153516 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/delete/DeleteAccountViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/delete/DeleteAccountViewModel.kt
@@ -81,6 +81,7 @@ class DeleteAccountViewModel(
         applyDeletionConfirmed()
       }
       DeleteAccountEvent.LaunchAppSettingsClicked -> {
+        _state.update { it.copy(dialog = Dialog.None) }
         _actions.send(DeleteAccountAction.LaunchAppSettings)
       }
       DeleteAccountEvent.DialogDismissed -> {
diff --git a/app/src/test/java/org/thoughtcrime/securesms/delete/DeleteAccountViewModelTest.kt b/app/src/test/java/org/thoughtcrime/securesms/delete/DeleteAccountViewModelTest.kt
index 4a63bf8ee9..a27c2e21c5 100644
--- a/app/src/test/java/org/thoughtcrime/securesms/delete/DeleteAccountViewModelTest.kt
+++ b/app/src/test/java/org/thoughtcrime/securesms/delete/DeleteAccountViewModelTest.kt
@@ -266,6 +266,7 @@ class DeleteAccountViewModelTest {
 
     viewModel.onEvent(DeleteAccountEvent.LaunchAppSettingsClicked)
     assertThat(actions).contains(DeleteAccountAction.LaunchAppSettings)
+    assertThat(viewModel.state.value.dialog).isEqualTo(Dialog.None)
   }
 
   @Test