diff --git a/torchci/components/JobLinks.tsx b/torchci/components/JobLinks.tsx
index 521887252b..dfd71bd375 100644
--- a/torchci/components/JobLinks.tsx
+++ b/torchci/components/JobLinks.tsx
@@ -201,10 +201,16 @@ function DisableTest({ job, label }: { job: JobData; label: string }) {
 
   // At this point, we should show something. Search the existing disable issues
   // for a matching one.
+  const formattedTestName = `${testName.testName} (__main__.${testName.suite})`;
   const issueTitle = `DISABLED ${testName.testName} (__main__.${testName.suite})`;
   const issueBody = formatDisableTestBody(job);
 
-  const matchingIssues = issues.filter((issue) => issue.title === issueTitle);
+  const matchingIssues = issues.filter(
+    (issue) =>
+      issue.title === issueTitle ||
+      // Crude way to match with aggregate issues
+      issue.body.includes(formattedTestName)
+  );
   const repo = job.repo ?? "pytorch/pytorch";
 
   return (