diff --git a/Quick-Settings/app/src/completed/java/com/google/android_quick_settings/QSIntentService.java b/Quick-Settings/app/src/completed/java/com/google/android_quick_settings/QSIntentService.java
index 53ec2c56f..3d8097869 100644
--- a/Quick-Settings/app/src/completed/java/com/google/android_quick_settings/QSIntentService.java
+++ b/Quick-Settings/app/src/completed/java/com/google/android_quick_settings/QSIntentService.java
@@ -20,6 +20,8 @@
 import android.service.quicksettings.Tile;
 import android.service.quicksettings.TileService;
 
+import androidx.core.os.BuildCompat;
+
 @SuppressLint("Override")
 public class QSIntentService extends TileService {
 
@@ -46,6 +48,9 @@ public void onClick() {
                     tileLabel);
             intent.putExtra(ResultActivity.RESULT_ACTIVITY_INFO_KEY,
                     tileState);
+            if (BuildCompat.isAtLeastP()) {
+                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            }
 
             startActivityAndCollapse(intent);
         }