diff --git a/frontend/src/app/shared/components/project-list/project-list.component.html b/frontend/src/app/shared/components/project-list/project-list.component.html
index 7b2328474d..75c141546f 100644
--- a/frontend/src/app/shared/components/project-list/project-list.component.html
+++ b/frontend/src/app/shared/components/project-list/project-list.component.html
@@ -52,7 +52,7 @@
       [ngClass]="{ 'spot-list--item-action_disabled': project.disabled }"
       [title]="project.name"
       [href]="extendedProjectUrl(project.id)"
-      [attr.data-list-action-selector]="projectListActionIdentifier"
+      [attr.data-list-selector]="projectListActionIdentifier"
     >
     <span
       class="op-project-list--item-title spot-list--item-title"
diff --git a/frontend/src/app/shared/components/project-list/project-list.component.ts b/frontend/src/app/shared/components/project-list/project-list.component.ts
index d2dce1b725..7bc71e789b 100644
--- a/frontend/src/app/shared/components/project-list/project-list.component.ts
+++ b/frontend/src/app/shared/components/project-list/project-list.component.ts
@@ -57,6 +57,7 @@ export class OpProjectListComponent {
   };
 
   projectListActionIdentifier = projectListActionIdentifier;
+
   projectListItemIdentifier = projectListItemIdentifier;
 
   constructor(
diff --git a/frontend/src/app/shared/components/searchable-project-list/searchable-project-list.service.ts b/frontend/src/app/shared/components/searchable-project-list/searchable-project-list.service.ts
index 875efc5057..476ea0122c 100644
--- a/frontend/src/app/shared/components/searchable-project-list/searchable-project-list.service.ts
+++ b/frontend/src/app/shared/components/searchable-project-list/searchable-project-list.service.ts
@@ -15,7 +15,6 @@ import { KeyCodes } from 'core-app/shared/helpers/keyCodes.enum';
 import {
   projectListActionSelector,
   projectListItemDisabled,
-  projectListItemSelector,
   projectListRootSelector,
 } from 'core-app/shared/components/project-list/project-list.component';
 
@@ -92,7 +91,7 @@ export class SearchableProjectListService {
 
     // If we're moving down, select first
     if (!upwards) {
-      const first = document.querySelector<HTMLElement>(projectListActionSelector);
+      const first = document.querySelector<HTMLElement>(`${projectListActionSelector}:not(${projectListItemDisabled})`);
       first?.focus();
     }
   }