diff --git a/app/src/main/java/com/x8bit/bitwarden/data/autofill/util/AutofillIntentUtils.kt b/app/src/main/java/com/x8bit/bitwarden/data/autofill/util/AutofillIntentUtils.kt
index 795789f5f..dea17c41d 100644
--- a/app/src/main/java/com/x8bit/bitwarden/data/autofill/util/AutofillIntentUtils.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/autofill/util/AutofillIntentUtils.kt
@@ -36,7 +36,10 @@ fun createAutofillSelectionIntent(
 ): Intent =
     Intent(context, MainActivity::class.java)
         .apply {
-            setFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+            // This helps prevent a crash when using the accessibility framework
+            if (framework == AutofillSelectionData.Framework.ACCESSIBILITY) {
+                setFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+            }
             putExtra(
                 AUTOFILL_BUNDLE_KEY,
                 bundleOf(