diff --git a/__tests__/cases/non-parallel/pjax.general.ts b/__tests__/cases/non-parallel/pjax.general.ts
index eb74500..96dd63d 100644
--- a/__tests__/cases/non-parallel/pjax.general.ts
+++ b/__tests__/cases/non-parallel/pjax.general.ts
@@ -33,6 +33,6 @@ describe(`in Gitako project page`, () => {
     page.goBack()
     await sleep(1000)
 
-    expect(await getTextContent(selectors.github.breadcrumbFileName)).toBe('analytics.ts')
+    expect(await getTextContent(selectors.github.breadcrumbFileName)).toBe('/analytics.ts')
   })
 })
diff --git a/__tests__/cases/parallel/expand-to-target.ts b/__tests__/cases/parallel/expand-to-target.ts
index 73a1f9a..58f588c 100644
--- a/__tests__/cases/parallel/expand-to-target.ts
+++ b/__tests__/cases/parallel/expand-to-target.ts
@@ -10,7 +10,7 @@ describe(`in Gitako project page`, () => {
     // Expect Gitako sidebar to have expanded src to see contents
     await expectToFind(selectors.gitako.fileItemOf('src/components'))
 
-    await page.click(selectors.github.fileListItem('components'))
+    await page.click(selectors.github.fileListItemOf('components'))
     await waitForRedirect()
 
     // Expect Gitako sidebar to have expanded components and see contents
diff --git a/__tests__/selectors.ts b/__tests__/selectors.ts
index 12dcdd7..2396410 100644
--- a/__tests__/selectors.ts
+++ b/__tests__/selectors.ts
@@ -1,12 +1,12 @@
 export const selectors = {
   github: {
-    breadcrumbFileName: `[data-testid="breadcrumbs-filename"] #file-name-id`,
+    breadcrumbFileName: `[data-testid="breadcrumbs-filename"]`,
     fileContent: 'textarea[aria-label="file content"]',
     commitLinks: `main .TimelineItem-body ol li > div:nth-child(1) a[href*="/commit/"]`,
     // assume title contains `.` is file item
-    fileListItemFileLinks: `#repo-content-turbo-frame [aria-labelledby="folders-and-files"] tr.react-directory-row .react-directory-filename-column .react-directory-truncate[title*="."] a`,
-    fileListItem: (name: string) =>
-      `#repo-content-turbo-frame [aria-labelledby="folders-and-files"] tr.react-directory-row [title="${name}"]`,
+    fileListItemFileLinks: `#repo-content-turbo-frame [aria-labelledby="folders-and-files"] tr.react-directory-row td:not(.react-directory-row-name-cell-small-screen) .react-directory-filename-column .react-directory-truncate[title*="."] a`,
+    fileListItemOf: (name: string) =>
+      `#repo-content-turbo-frame [aria-labelledby="folders-and-files"] tr.react-directory-row td:not(.react-directory-row-name-cell-small-screen) [title="${name}"]`,
     commitSummary: 'div.commit',
     navBarItemIssues: 'a[data-selected-links^="repo_issues "]',
     navBarItemPulls: 'a[data-selected-links^="repo_pulls "]',
diff --git a/src/platforms/GitHub/DOMHelper.ts b/src/platforms/GitHub/DOMHelper.ts
index ec5a795..8740965 100644
--- a/src/platforms/GitHub/DOMHelper.ts
+++ b/src/platforms/GitHub/DOMHelper.ts
@@ -8,7 +8,7 @@ import { renderReact } from 'utils/general'
 const selectors = {
   normal: {
     reactApp: `react-app[app-name="react-code-view"] [data-target="react-app.reactRoot"]`,
-    branchSwitcher: `summary[title="Switch branches or tags"]`,
+    branchSwitcher: [`summary[title="Switch branches or tags"]`, `#branch-select-menu`].join(),
     fileNavigation: `.file-navigation`,
     breadcrumbs: `[data-testid="breadcrumbs"]`,
     breadcrumbsFilename: `[data-testid="breadcrumbs-filename"]`,