diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index d38a27ccec..b875fcde82 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -6,6 +6,62 @@ on:
       - main
 
 jobs:
+  diagnose-output-select:
+    name: output-select (attempt ${{ matrix.attempt }})
+    runs-on: ubuntu-24.04
+    strategy:
+      fail-fast: false
+      max-parallel: 1
+      matrix:
+        attempt: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20]
+    timeout-minutes: 30
+    steps:
+      - uses: actions/checkout@v7
+      - uses: actions/setup-node@v7
+        with:
+          node-version-file: '.nvmrc'
+      - name: Compute node modules cache key
+        id: nodeModulesCacheKey
+        run: echo "value=$(node scripts/computeNodeModulesCacheKey.js)" >> $GITHUB_OUTPUT
+        shell: bash
+      - uses: actions/cache@v6
+        id: npm-cache
+        with:
+          path: |
+            **/node_modules
+            **/.vscode-test
+            **/.vscode-user-data-dir
+            **/.vscode-ffmpeg
+            **/.vscode-resolve-source-map-cache
+          key: ${{ runner.os }}-cacheNodeModules-${{ steps.nodeModulesCacheKey.outputs.value }}
+      - name: npm ci
+        run: npm ci --ignore-scripts && npm run postinstall
+        if: steps.npm-cache.outputs.cache-hit != 'true'
+      - run: npm run build
+      - name: Run output-select diagnostic attempt ${{ matrix.attempt }}
+        uses: coactions/setup-xvfb@v1
+        with:
+          run: >-
+            node packages/cli/bin/test.js
+            --cwd packages/e2e
+            --check-leaks
+            --measure-after
+            --measure detached-dom-nodes-with-stack-traces
+            --restart-between
+            --run-skipped-tests-anyway
+            --only ^output-select.ts
+            --workers 1
+            --record-video
+      - uses: actions/upload-artifact@v7
+        if: always()
+        with:
+          name: output-select-attempt-${{ matrix.attempt }}
+          path: |
+            ./.vscode-memory-leak-finder-results
+            ./.vscode-videos
+          include-hidden-files: true
+          if-no-files-found: ignore
+
   pr:
     runs-on: ${{ matrix.os }}
     strategy:
diff --git a/packages/page-object/src/parts/Output/Output.ts b/packages/page-object/src/parts/Output/Output.ts
index 4ec2fadfa7..069d0e5a32 100644
--- a/packages/page-object/src/parts/Output/Output.ts
+++ b/packages/page-object/src/parts/Output/Output.ts
@@ -127,8 +127,7 @@ export const create = ({ electronApp, expect, ideVersion, page, platform, VError
         await quickPick.select(channelName)
         await expect(select).toHaveValue(channelName)
 
-        const nameLower = channelName.toLowerCase()
-        const editor = page.locator(`.monaco-editor[data-uri^="output:${nameLower}"]`)
+        const editor = outputView.locator('.monaco-editor')
         await expect(editor).toBeVisible()
         await page.waitForIdle()