diff --git a/src/dotnet-roslyn-tools/.vscode/launch.json b/src/dotnet-roslyn-tools/.vscode/launch.json
index a16287f9bb..a96da8b993 100644
--- a/src/dotnet-roslyn-tools/.vscode/launch.json
+++ b/src/dotnet-roslyn-tools/.vscode/launch.json
@@ -22,6 +22,27 @@
             "console": "internalConsole",
             "stopAtEntry": false
         },
+        {
+            "name": "Run `pr-finder` on Razor",
+            "type": "coreclr",
+            "request": "launch",
+            "preLaunchTask": "build",
+            "program": "${workspaceFolder}/../../artifacts/bin/Microsoft.RoslynTools/Debug/net9.0/Microsoft.RoslynTools.dll",
+            "args": [
+              "pr-finder",
+              "-s",
+              "e15fe5b8b38c1b1e1adb9c8a4d76567aa1c397db",
+              "-e",
+              "main",
+              "--format",
+              "changelog",
+              "-v",
+              "diag"
+            ],
+            "cwd": "${workspaceFolder}/../../../razor",
+            "console": "internalConsole",
+            "stopAtEntry": false
+        },
         {
             "name": "Run `vsbranchinfo`",
             "type": "coreclr",
diff --git a/src/dotnet-roslyn-tools/PRFinder/Hosts/GitHub.cs b/src/dotnet-roslyn-tools/PRFinder/Hosts/GitHub.cs
index 6b1817395d..f5f578902f 100644
--- a/src/dotnet-roslyn-tools/PRFinder/Hosts/GitHub.cs
+++ b/src/dotnet-roslyn-tools/PRFinder/Hosts/GitHub.cs
@@ -93,11 +93,11 @@ public bool ShouldSkip(Commit commit, ref bool mergePRFound)
             match = IsGitHubSquashedPRCommit().Match(commit.MessageShort);
             if (match.Success)
             {
-                var prNumber = match.Groups[1].Value;
+                var prNumber = match.Groups[2].Value;
 
                 // Squash PR Messages are in the form "Nullable annotate TypeCompilationState and MessageID (#39449)"
-                // Take the 1st line since it should be descriptive.
-                var comment = commit.MessageShort;
+                // Take the first line up until the PR number.
+                var comment = match.Groups[1].Value;
                 return new(prNumber, comment);
             }
         }
@@ -198,6 +198,6 @@ protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage
     private static partial Regex IsGitHubActionCodeFlowCommit();
     [GeneratedRegex(@"^Merge pull request #(\d+) from")]
     private static partial Regex IsGitHubMergePRCommit();
-    [GeneratedRegex(@"\(#(\d+)\)(?:\n|$)")]
+    [GeneratedRegex(@"^(.*) \(#(\d+)\)(?:\n|$)")]
     private static partial Regex IsGitHubSquashedPRCommit();
 }