From 7a3b0437e21b988eda2b4966950cbc84e6ad3c32 Mon Sep 17 00:00:00 2001
From: Phillip Rak <rak.phillip@gmail.com>
Date: Fri, 24 Oct 2025 14:56:41 -0700
Subject: [PATCH 1/3] Focus namespace filter input after clearing filters

Signed-off-by: Phillip Rak <rak.phillip@gmail.com>
---
 shell/components/nav/NamespaceFilter.vue | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/shell/components/nav/NamespaceFilter.vue b/shell/components/nav/NamespaceFilter.vue
index f40d4469495..a9d5e641382 100644
--- a/shell/components/nav/NamespaceFilter.vue
+++ b/shell/components/nav/NamespaceFilter.vue
@@ -673,9 +673,16 @@ export default {
     },
 
     removeOption(ns, event) {
-      this.selectOption(ns);
       event.preventDefault();
       event.stopPropagation();
+
+      this.selectOption(ns);
+
+      if (event.type !== 'keydown' || this.value.length !== 0) {
+        return;
+      }
+
+      this.$refs.namespaceFilterInput.focus();
     },
 
     defaultOption() {

From 59075bbacd9842cc212c0333716af59cef690d11 Mon Sep 17 00:00:00 2001
From: Phillip Rak <rak.phillip@gmail.com>
Date: Fri, 31 Oct 2025 16:55:37 -0700
Subject: [PATCH 2/3] Update namespace filter focus ring color

Signed-off-by: Phillip Rak <rak.phillip@gmail.com>
---
 shell/components/nav/NamespaceFilter.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/shell/components/nav/NamespaceFilter.vue b/shell/components/nav/NamespaceFilter.vue
index a9d5e641382..7cd10b435be 100644
--- a/shell/components/nav/NamespaceFilter.vue
+++ b/shell/components/nav/NamespaceFilter.vue
@@ -958,6 +958,10 @@ export default {
     display: inline-block;
     border-radius: var(--border-radius);
 
+    &:focus, &.focused {
+      @include focus-outline;
+    }
+
     .ns-glass {
       top: 0;
       bottom: 0;

From 7d07b5693273668dd653f67f0da240ae9eea8e6e Mon Sep 17 00:00:00 2001
From: Phillip Rak <rak.phillip@gmail.com>
Date: Fri, 31 Oct 2025 16:55:57 -0700
Subject: [PATCH 3/3] Add aria label to filter clear button

Signed-off-by: Phillip Rak <rak.phillip@gmail.com>
---
 shell/assets/translations/en-us.yaml     | 1 +
 shell/components/nav/NamespaceFilter.vue | 1 +
 2 files changed, 2 insertions(+)

diff --git a/shell/assets/translations/en-us.yaml b/shell/assets/translations/en-us.yaml
index e96d25522a8..66f43e86345 100644
--- a/shell/assets/translations/en-us.yaml
+++ b/shell/assets/translations/en-us.yaml
@@ -4634,6 +4634,7 @@ namespaceFilter:
   button:
     clear: Remove applied namespace filters
     clearFilter: Clear namespace options filter
+  removeNamespace: 'Remove {name} from filter'
 
 namespaceList:
   selectLabel: Namespace
diff --git a/shell/components/nav/NamespaceFilter.vue b/shell/components/nav/NamespaceFilter.vue
index 7cd10b435be..b11daf14daa 100644
--- a/shell/components/nav/NamespaceFilter.vue
+++ b/shell/components/nav/NamespaceFilter.vue
@@ -789,6 +789,7 @@ export default {
             ghost
             class="ns-chip-button"
             :data-testid="`namespaces-values-close-${j}`"
+            :aria-label="t('namespaceFilter.removeNamespace', { name: ns.label })"
             @click="removeOption(ns, $event)"
             @keydown.enter.space.stop="removeOption(ns, $event)"
             @mousedown="handleValueMouseDown(ns, $event)"