From 919ea8d4c0b78f886cc00fe5ae309ec0f646dae1 Mon Sep 17 00:00:00 2001
From: Sameh Khamis <sameh@halfpixel.ai>
Date: Sat, 14 Nov 2026 16:25:32 -0800
Subject: [PATCH] Make the Data Layers finder keep Escape, its category and
 keyboard users

- Escape in the field closes the search alone, focus back on its button,
  without folding the panel or leaving the cockpit.
- The category is the group's key (LayerRows' data-group), so a language
  change keeps it; a group that goes away clears it.
- On and Off follow whether the layer is enabled, not its feed's state.
- The filter is a disclosure of two groups of toggle buttons: opening it
  focuses the chosen option, the arrows, Home and End move, Escape closes
  it, and it stays inside the panel.
- No layers match is translated, the search matches names only, and the
  rows are filtered once per frame at most.
- A voice request to show a layer the finder hides clears the finder.

Co-authored-by: Manjunath Paparaju <manjunath@halfpixel.ai>
---
 src/i18n/locales/ar.json            |   3 +-
 src/i18n/locales/de.json            |   3 +-
 src/i18n/locales/es.json            |   3 +-
 src/i18n/locales/fr.json            |   3 +-
 src/i18n/locales/he.json            |   3 +-
 src/i18n/locales/it.json            |   3 +-
 src/i18n/locales/ja.json            |   3 +-
 src/i18n/locales/pt.json            |   3 +-
 src/i18n/locales/ru.json            |   3 +-
 src/i18n/locales/sv.json            |   3 +-
 src/i18n/locales/uk.json            |   3 +-
 src/i18n/locales/zh-CN.json         |   3 +-
 src/i18n/locales/zh-Hant.json       |   3 +-
 src/ui/cockpitInput.js              |   3 +
 src/ui/layerPanel/LayerRows.vue     |   8 +-
 src/ui/styles/layer-finder.css      |  16 +-
 src/ui/views/panels/LayerFinder.vue | 218 ++++++++++++++++++++--------
 src/voice/gevActions.js             |   4 +
 18 files changed, 207 insertions(+), 81 deletions(-)

diff --git a/src/i18n/locales/ar.json b/src/i18n/locales/ar.json
index 0f5afd026..5fe57db79 100644
--- a/src/i18n/locales/ar.json
+++ b/src/i18n/locales/ar.json
@@ -3986,5 +3986,6 @@
   "Status": "الحالة",
   "Search layers…": "ابحث في الطبقات…",
   "Layer groups": "مجموعات الطبقات",
-  "Jump to {name}": "الانتقال إلى {name}"
+  "Jump to {name}": "الانتقال إلى {name}",
+  "No layers match": "لا توجد طبقات مطابقة"
 }
diff --git a/src/i18n/locales/de.json b/src/i18n/locales/de.json
index bb4c85cf4..9964801bb 100644
--- a/src/i18n/locales/de.json
+++ b/src/i18n/locales/de.json
@@ -3638,5 +3638,6 @@
   "Status": "Status",
   "Search layers…": "Ebenen suchen…",
   "Layer groups": "Ebenengruppen",
-  "Jump to {name}": "Zu {name} springen"
+  "Jump to {name}": "Zu {name} springen",
+  "No layers match": "Keine passenden Ebenen"
 }
diff --git a/src/i18n/locales/es.json b/src/i18n/locales/es.json
index 65aaeb2c8..cc72601c9 100644
--- a/src/i18n/locales/es.json
+++ b/src/i18n/locales/es.json
@@ -3725,5 +3725,6 @@
   "Status": "Estado",
   "Search layers…": "Buscar capas…",
   "Layer groups": "Grupos de capas",
-  "Jump to {name}": "Ir a {name}"
+  "Jump to {name}": "Ir a {name}",
+  "No layers match": "Ninguna capa coincide"
 }
diff --git a/src/i18n/locales/fr.json b/src/i18n/locales/fr.json
index 874d6ad4e..0e417867e 100644
--- a/src/i18n/locales/fr.json
+++ b/src/i18n/locales/fr.json
@@ -3725,5 +3725,6 @@
   "Status": "État",
   "Search layers…": "Rechercher des couches…",
   "Layer groups": "Groupes de couches",
-  "Jump to {name}": "Aller à {name}"
+  "Jump to {name}": "Aller à {name}",
+  "No layers match": "Aucune couche ne correspond"
 }
diff --git a/src/i18n/locales/he.json b/src/i18n/locales/he.json
index 97b99390f..16dbedb45 100644
--- a/src/i18n/locales/he.json
+++ b/src/i18n/locales/he.json
@@ -3725,5 +3725,6 @@
   "Status": "מצב",
   "Search layers…": "חיפוש שכבות…",
   "Layer groups": "קבוצות שכבות",
-  "Jump to {name}": "מעבר אל {name}"
+  "Jump to {name}": "מעבר אל {name}",
+  "No layers match": "אין שכבות תואמות"
 }
diff --git a/src/i18n/locales/it.json b/src/i18n/locales/it.json
index 908ee926e..e3fe590e5 100644
--- a/src/i18n/locales/it.json
+++ b/src/i18n/locales/it.json
@@ -3725,5 +3725,6 @@
   "Status": "Stato",
   "Search layers…": "Cerca livelli…",
   "Layer groups": "Gruppi di livelli",
-  "Jump to {name}": "Vai a {name}"
+  "Jump to {name}": "Vai a {name}",
+  "No layers match": "Nessun livello corrisponde"
 }
diff --git a/src/i18n/locales/ja.json b/src/i18n/locales/ja.json
index 56cdfaad3..0a7d60ba9 100644
--- a/src/i18n/locales/ja.json
+++ b/src/i18n/locales/ja.json
@@ -3551,5 +3551,6 @@
   "Status": "状態",
   "Search layers…": "レイヤーを検索…",
   "Layer groups": "レイヤーのグループ",
-  "Jump to {name}": "{name} へ移動"
+  "Jump to {name}": "{name} へ移動",
+  "No layers match": "一致するレイヤーはありません"
 }
diff --git a/src/i18n/locales/pt.json b/src/i18n/locales/pt.json
index b31f097a3..2e3b0d016 100644
--- a/src/i18n/locales/pt.json
+++ b/src/i18n/locales/pt.json
@@ -3725,5 +3725,6 @@
   "Status": "Estado",
   "Search layers…": "Pesquisar camadas…",
   "Layer groups": "Grupos de camadas",
-  "Jump to {name}": "Ir para {name}"
+  "Jump to {name}": "Ir para {name}",
+  "No layers match": "Nenhuma camada corresponde"
 }
diff --git a/src/i18n/locales/ru.json b/src/i18n/locales/ru.json
index f771d1bf5..5553d847e 100644
--- a/src/i18n/locales/ru.json
+++ b/src/i18n/locales/ru.json
@@ -3812,5 +3812,6 @@
   "Status": "Состояние",
   "Search layers…": "Поиск слоёв…",
   "Layer groups": "Группы слоёв",
-  "Jump to {name}": "Перейти к «{name}»"
+  "Jump to {name}": "Перейти к «{name}»",
+  "No layers match": "Нет подходящих слоёв"
 }
diff --git a/src/i18n/locales/sv.json b/src/i18n/locales/sv.json
index 017f32985..05f004f07 100644
--- a/src/i18n/locales/sv.json
+++ b/src/i18n/locales/sv.json
@@ -3638,5 +3638,6 @@
   "Status": "Status",
   "Search layers…": "Sök lager…",
   "Layer groups": "Lagergrupper",
-  "Jump to {name}": "Gå till {name}"
+  "Jump to {name}": "Gå till {name}",
+  "No layers match": "Inga lager matchar"
 }
diff --git a/src/i18n/locales/uk.json b/src/i18n/locales/uk.json
index 3b765b59a..d841eb0b9 100644
--- a/src/i18n/locales/uk.json
+++ b/src/i18n/locales/uk.json
@@ -3812,5 +3812,6 @@
   "Status": "Стан",
   "Search layers…": "Пошук шарів…",
   "Layer groups": "Групи шарів",
-  "Jump to {name}": "Перейти до «{name}»"
+  "Jump to {name}": "Перейти до «{name}»",
+  "No layers match": "Немає відповідних шарів"
 }
diff --git a/src/i18n/locales/zh-CN.json b/src/i18n/locales/zh-CN.json
index 317563a5a..26109d574 100644
--- a/src/i18n/locales/zh-CN.json
+++ b/src/i18n/locales/zh-CN.json
@@ -3551,5 +3551,6 @@
   "Status": "状态",
   "Search layers…": "搜索图层…",
   "Layer groups": "图层分组",
-  "Jump to {name}": "跳转到{name}"
+  "Jump to {name}": "跳转到{name}",
+  "No layers match": "没有匹配的图层"
 }
diff --git a/src/i18n/locales/zh-Hant.json b/src/i18n/locales/zh-Hant.json
index 079a49167..f119fd487 100644
--- a/src/i18n/locales/zh-Hant.json
+++ b/src/i18n/locales/zh-Hant.json
@@ -3551,5 +3551,6 @@
   "Status": "狀態",
   "Search layers…": "搜尋圖層…",
   "Layer groups": "圖層分組",
-  "Jump to {name}": "跳至{name}"
+  "Jump to {name}": "跳至{name}",
+  "No layers match": "沒有符合的圖層"
 }
diff --git a/src/ui/cockpitInput.js b/src/ui/cockpitInput.js
index 9574068ce..658501195 100644
--- a/src/ui/cockpitInput.js
+++ b/src/ui/cockpitInput.js
@@ -248,6 +248,9 @@ export function onKeyDown(event) {
     if (event.target?.closest?.('.cesium-credit-lightbox')) return;
     // An open Display or Radio popover takes Escape itself.
     if (this.isUtilityDisclosureOpen?.()) return;
+    // So do the Data Layers search field and filter menu.
+    if (event.target?.closest?.('.layer-finder__field, .layer-finder__menu'))
+      return;
     if (this.context?.contains(event.target) && !this.contextCollapsed) {
       event.preventDefault();
       event.stopImmediatePropagation();
diff --git a/src/ui/layerPanel/LayerRows.vue b/src/ui/layerPanel/LayerRows.vue
index ee0490913..9358ad2b8 100644
--- a/src/ui/layerPanel/LayerRows.vue
+++ b/src/ui/layerPanel/LayerRows.vue
@@ -22,9 +22,11 @@ defineProps({
 
 <template>
   <template v-for="item in items" :key="item.key"
-    ><h3 v-if="item.heading" class="data-layer-group-heading">{{
-      item.heading
-    }}</h3
+    ><h3
+      v-if="item.heading"
+      class="data-layer-group-heading"
+      :data-group="item.key"
+      >{{ item.heading }}</h3
     ><div
       v-else
       class="data-toggle-row"
diff --git a/src/ui/styles/layer-finder.css b/src/ui/styles/layer-finder.css
index 32a09092f..21b711dac 100644
--- a/src/ui/styles/layer-finder.css
+++ b/src/ui/styles/layer-finder.css
@@ -151,10 +151,10 @@
   display: none !important;
 }
 
-#data-toggles.is-filtering[data-shown='0']::after {
-  content: 'No layers match';
-  display: block;
-  padding: 1rem 0.5rem;
+.layer-finder__empty {
+  flex-basis: 100%;
+  margin: 0;
+  padding: 0.6rem 0.5rem;
   color: rgba(199, 214, 222, 0.5);
   font-size: 0.72rem;
   text-align: center;
@@ -162,6 +162,7 @@
 
 .layer-finder__menu {
   max-height: 60vh;
+  box-sizing: border-box;
   overflow-y: auto;
   min-width: 170px;
 }
@@ -175,7 +176,12 @@
   text-transform: uppercase;
 }
 
-.layer-finder__menu-head:not(:first-child) {
+/* Each group of options lays out as part of the menu's grid. */
+.layer-finder__menu > span {
+  display: contents;
+}
+
+.layer-finder__menu > span + span > .layer-finder__menu-head {
   margin-top: 0.2rem;
   border-top: 1px solid rgba(255, 255, 255, 0.08);
 }
diff --git a/src/ui/views/panels/LayerFinder.vue b/src/ui/views/panels/LayerFinder.vue
index e55584b4d..9a1c69820 100644
--- a/src/ui/views/panels/LayerFinder.vue
+++ b/src/ui/views/panels/LayerFinder.vue
@@ -1,6 +1,9 @@
 <script>
 import { ref as moduleRef } from 'vue';
 
+/** Voice and other callers ask for this event to show every row again. */
+export const LAYER_FINDER_CLEAR_EVENT = 'gev:layer-finder-clear';
+
 // The header buttons and the bar under the header are two instances that
 // share one finder.
 const finder = {
@@ -8,13 +11,16 @@ const finder = {
   show: moduleRef('all'),
   searching: moduleRef(false),
   filtering: moduleRef(false),
+  // A group's stable key (LayerRows' `data-group`), not its translated name,
+  // so a language change keeps the choice.
   category: moduleRef(''),
   categories: moduleRef([]),
+  shown: moduleRef(0),
 };
 </script>
 
 <script setup>
-import { nextTick, onBeforeUnmount, onMounted, ref, watch } from 'vue';
+import { nextTick, onBeforeUnmount, onMounted, ref, watch, computed } from 'vue';
 import { msg, t } from '../../../i18n/index.js';
 
 // Search and filter for the Data Layers list. The rows are rendered elsewhere
@@ -26,8 +32,8 @@ const props = defineProps({
   part: { type: String, default: 'buttons' },
 });
 
-const { query, show, searching, filtering, category, categories } = finder;
-const input = ref(null);
+const { query, show, searching, filtering, category, categories, shown } =
+  finder;
 
 const SHOWS = [
   { id: 'all', label: msg('All layers') },
@@ -35,36 +41,44 @@ const SHOWS = [
   { id: 'off', label: msg('Off') },
 ];
 
+const narrowed = computed(
+  () =>
+    Boolean(query.value.trim()) || show.value !== 'all' || Boolean(category.value),
+);
+const categoryLabel = computed(
+  () => categories.value.find((c) => c.key === category.value)?.label || '',
+);
+
 function apply() {
   const list = document.getElementById('data-toggles');
   if (!list) return;
   const q = query.value.trim().toLocaleLowerCase();
   let heading = null;
   let headingHasRows = false;
-  let shown = 0;
+  let count = 0;
   let group = '';
   const groups = [];
-  const close = () => heading?.classList.toggle('is-filtered', !headingHasRows);
+  const close = () =>
+    heading?.classList.toggle('is-filtered', !headingHasRows);
   for (const el of list.children) {
     if (el.classList.contains('data-layer-group-heading')) {
       close();
       heading = el;
       headingHasRows = false;
-      group = el.textContent.trim();
-      groups.push(group);
+      group = el.dataset.group || el.textContent.trim();
+      groups.push({ key: group, label: el.textContent.trim() });
       continue;
     }
     if (!el.classList.contains('data-toggle-row')) continue;
     // The name on screen, in the UI language, and the English name too.
-    const name = [
-      el.querySelector('.data-name')?.textContent,
-      el.dataset.layerName,
-      el.querySelector('.data-toggle-meta')?.textContent,
-    ]
+    const name = [el.querySelector('.data-name')?.textContent, el.dataset.layerName]
       .filter(Boolean)
       .join(' ')
       .toLocaleLowerCase();
-    const on = (el.querySelector('.data-toggle-btn')?.dataset.feedState || 'off') !== 'off';
+    // On means the layer is enabled, whatever its feed is doing.
+    const on = Boolean(
+      el.querySelector('.data-toggle-btn')?.classList.contains('active'),
+    );
     const match =
       (!q || name.includes(q)) &&
       (show.value === 'all' || (show.value === 'on') === on) &&
@@ -72,92 +86,176 @@ function apply() {
     el.classList.toggle('is-filtered', !match);
     if (match) {
       headingHasRows = true;
-      shown++;
+      count++;
     }
   }
   close();
-  list.classList.toggle('is-filtering', Boolean(q) || show.value !== 'all' || Boolean(category.value));
-  if (groups.join('|') !== categories.value.join('|')) categories.value = groups;
-  list.dataset.shown = String(shown);
+  list.classList.toggle('is-filtering', narrowed.value);
+  const same =
+    groups.length === categories.value.length &&
+    groups.every(
+      (g, i) =>
+        g.key === categories.value[i].key && g.label === categories.value[i].label,
+    );
+  if (!same) categories.value = groups;
+  // A group that went away takes its filter with it.
+  if (category.value && !groups.some((g) => g.key === category.value))
+    category.value = '';
+  shown.value = count;
+}
+
+function clearAll() {
+  query.value = '';
+  show.value = 'all';
+  category.value = '';
+  searching.value = false;
+  filtering.value = false;
+  apply();
 }
 
 let observer = null;
-onMounted(() => {
-  if (props.part !== 'bar') return;
-  const list = document.getElementById('data-toggles');
-  if (!list) return;
-  observer = new MutationObserver(() => apply());
-  observer.observe(list, { childList: true, subtree: true, attributes: true, attributeFilter: ['data-feed-state'] });
-  apply();
-});
-onBeforeUnmount(() => observer?.disconnect());
-if (props.part === 'bar') watch([query, show, category], apply);
+let frame = 0;
+if (props.part === 'bar') {
+  onMounted(() => {
+    const list = document.getElementById('data-toggles');
+    if (!list) return;
+    // Rows repaint many times a second; filter once per frame at most.
+    observer = new MutationObserver(() => {
+      if (frame) return;
+      frame = requestAnimationFrame(() => {
+        frame = 0;
+        apply();
+      });
+    });
+    observer.observe(list, {
+      childList: true,
+      subtree: true,
+      characterData: true,
+      attributes: true,
+      attributeFilter: ['class', 'data-feed-state'],
+    });
+    apply();
+    document.addEventListener(LAYER_FINDER_CLEAR_EVENT, clearAll);
+  });
+  onBeforeUnmount(() => {
+    observer?.disconnect();
+    cancelAnimationFrame(frame);
+    document.removeEventListener(LAYER_FINDER_CLEAR_EVENT, clearAll);
+  });
+  watch([query, show, category], apply);
+}
 
+const searchBtn = () => document.getElementById('layer-finder-search-btn');
 async function toggleSearch() {
   searching.value = !searching.value;
   if (!searching.value) query.value = '';
   await nextTick();
   if (searching.value) document.getElementById('layer-finder-input')?.focus();
 }
-function pick(id) {
-  show.value = id;
+// Escape in the field closes the search and stays there: it must not also
+// fold the panel or leave the cockpit.
+async function closeSearch() {
+  searching.value = false;
+  query.value = '';
+  await nextTick();
+  searchBtn()?.focus();
 }
-function pickCategory(name) {
-  category.value = category.value === name ? '' : name;
-}
-const active = () => show.value !== 'all' || Boolean(category.value);
 
-// The menu stays open while choosing; a click outside it or Esc closes it.
+// The filter is a disclosure of two groups of toggle buttons. Opening it moves
+// focus to the chosen option; Escape, or a press outside, closes it and gives
+// focus back to its button.
 const filterEl = ref(null);
-function onOutside(e) {
-  if (filtering.value && filterEl.value && !filterEl.value.contains(e.target)) filtering.value = false;
+const menuEl = ref(null);
+const triggerEl = ref(null);
+const options = () => [...(menuEl.value?.querySelectorAll('button') || [])];
+async function toggleFilter() {
+  filtering.value = !filtering.value;
+  if (!filtering.value) return;
+  await nextTick();
+  const menu = menuEl.value;
+  if (!menu) return;
+  // Keep the menu inside the panel, which clips what leaves it.
+  const panel = menu.closest('.ui-panel, [data-panel-id]');
+  const room = panel
+    ? panel.getBoundingClientRect().bottom - menu.getBoundingClientRect().top - 8
+    : 0;
+  menu.style.maxHeight = room > 80 ? `${Math.floor(room)}px` : '';
+  (menu.querySelector('[aria-pressed="true"]') || options()[0])?.focus();
 }
-function onEsc(e) {
-  if (e.key === 'Escape') filtering.value = false;
+function closeFilter({ refocus = false } = {}) {
+  filtering.value = false;
+  if (refocus) triggerEl.value?.focus();
+}
+function onMenuKey(event) {
+  if (event.key === 'Escape') {
+    event.preventDefault();
+    event.stopPropagation();
+    closeFilter({ refocus: true });
+    return;
+  }
+  const step = { ArrowDown: 1, ArrowUp: -1 }[event.key];
+  const edge = { Home: 0, End: -1 }[event.key];
+  if (step === undefined && edge === undefined) return;
+  event.preventDefault();
+  const all = options();
+  const at = all.indexOf(document.activeElement);
+  const next =
+    step !== undefined
+      ? all[(at + step + all.length) % all.length]
+      : all.at(edge);
+  next?.focus();
+}
+function onOutside(e) {
+  if (filtering.value && filterEl.value && !filterEl.value.contains(e.target))
+    closeFilter();
+}
+function pickCategory(key) {
+  category.value = category.value === key ? '' : key;
 }
 if (props.part === 'buttons') {
-  onMounted(() => {
-    document.addEventListener('pointerdown', onOutside, true);
-    document.addEventListener('keydown', onEsc);
-  });
-  onBeforeUnmount(() => {
-    document.removeEventListener('pointerdown', onOutside, true);
-    document.removeEventListener('keydown', onEsc);
-  });
+  onMounted(() => document.addEventListener('pointerdown', onOutside, true));
+  onBeforeUnmount(() =>
+    document.removeEventListener('pointerdown', onOutside, true),
+  );
 }
 </script>
 
 <template>
   <template v-if="part === 'buttons'">
-    <button type="button" class="layer-finder__btn" :class="{ active: searching || query }" :aria-pressed="String(searching)" :aria-label="t('Search layers')" :title="t('Search layers')" @click="toggleSearch">
+    <button id="layer-finder-search-btn" type="button" class="layer-finder__btn" :class="{ active: searching || query }" :aria-pressed="String(searching)" :aria-label="t('Search layers')" :title="t('Search layers')" @click="toggleSearch">
       <span class="material-symbols-outlined" aria-hidden="true">search</span>
     </button>
     <span ref="filterEl" class="layer-finder__filter">
-      <button type="button" class="layer-finder__btn" :class="{ active: show !== 'all' || category }" :aria-expanded="String(filtering)" :aria-label="t('Filter layers')" :title="t('Filter layers')" @click="filtering = !filtering">
+      <button ref="triggerEl" type="button" class="layer-finder__btn" :class="{ active: show !== 'all' || category }" :aria-expanded="String(filtering)" aria-controls="layer-finder-menu" :aria-label="t('Filter layers')" :title="t('Filter layers')" @click="toggleFilter">
         <span class="material-symbols-outlined" aria-hidden="true">filter_list</span>
       </button>
-      <span v-if="filtering" class="layer-finder__menu" role="menu">
-        <span class="layer-finder__menu-head">{{ t('Status') }}</span>
-        <button v-for="s in SHOWS" :key="s.id" type="button" role="menuitemradio" :aria-checked="String(show === s.id)" :class="{ active: show === s.id }" @click="pick(s.id)">
-          <span class="material-symbols-outlined" aria-hidden="true">{{ show === s.id ? 'radio_button_checked' : 'radio_button_unchecked' }}</span>{{ t(s.label) }}
-        </button>
-        <span v-if="categories.length" class="layer-finder__menu-head">{{ t('Category') }}</span>
-        <button v-for="c in categories" :key="c" type="button" role="menuitemradio" :aria-checked="String(category === c)" :class="{ active: category === c }" @click="pickCategory(c)">
-          <span class="material-symbols-outlined" aria-hidden="true">{{ category === c ? 'radio_button_checked' : 'radio_button_unchecked' }}</span>{{ c }}
-        </button>
+      <span v-if="filtering" id="layer-finder-menu" ref="menuEl" class="layer-finder__menu" role="group" :aria-label="t('Filter layers')" @keydown="onMenuKey">
+        <span role="group" :aria-label="t('Status')">
+          <span class="layer-finder__menu-head" aria-hidden="true">{{ t('Status') }}</span>
+          <button v-for="s in SHOWS" :key="s.id" type="button" :aria-pressed="String(show === s.id)" :class="{ active: show === s.id }" @click="show = s.id">
+            <span class="material-symbols-outlined" aria-hidden="true">{{ show === s.id ? 'radio_button_checked' : 'radio_button_unchecked' }}</span>{{ t(s.label) }}
+          </button>
+        </span>
+        <span v-if="categories.length" role="group" :aria-label="t('Category')">
+          <span class="layer-finder__menu-head" aria-hidden="true">{{ t('Category') }}</span>
+          <button v-for="c in categories" :key="c.key" type="button" :aria-pressed="String(category === c.key)" :class="{ active: category === c.key }" @click="pickCategory(c.key)">
+            <span class="material-symbols-outlined" aria-hidden="true">{{ category === c.key ? 'radio_button_checked' : 'radio_button_unchecked' }}</span>{{ c.label }}
+          </button>
+        </span>
       </span>
     </span>
   </template>
-  <div v-else-if="searching || active()" class="layer-finder__bar">
+  <div v-else-if="searching || narrowed" class="layer-finder__bar">
     <label v-if="searching" class="layer-finder__field">
       <span class="material-symbols-outlined" aria-hidden="true">search</span>
-      <input id="layer-finder-input" ref="input" v-model="query" type="search" :placeholder="t('Search layers…')" :aria-label="t('Search layers')" @keydown.esc="toggleSearch" />
+      <input id="layer-finder-input" v-model="query" type="search" :placeholder="t('Search layers…')" :aria-label="t('Search layers')" @keydown.esc.stop.prevent="closeSearch" />
     </label>
     <button v-if="show !== 'all'" type="button" class="layer-finder__chip" @click="show = 'all'">
       {{ show === 'on' ? t('On') : t('Off') }}<span class="material-symbols-outlined" aria-hidden="true">close</span>
     </button>
     <button v-if="category" type="button" class="layer-finder__chip" @click="category = ''">
-      {{ category }}<span class="material-symbols-outlined" aria-hidden="true">close</span>
+      {{ categoryLabel }}<span class="material-symbols-outlined" aria-hidden="true">close</span>
     </button>
+    <p v-if="narrowed && shown === 0" class="layer-finder__empty" role="status">{{ t('No layers match') }}</p>
   </div>
 </template>
diff --git a/src/voice/gevActions.js b/src/voice/gevActions.js
index 9a38408b2..703a6bd69 100644
--- a/src/voice/gevActions.js
+++ b/src/voice/gevActions.js
@@ -3727,6 +3727,10 @@ function findDataLayerRow(layerId) {
 }
 
 function focusDataLayerRow(row, layerId) {
+  // A row the Data Layers finder hides could not be seen: show every row
+  // again (LAYER_FINDER_CLEAR_EVENT in LayerFinder.vue).
+  if (row.classList.contains('is-filtered'))
+    document.dispatchEvent(new CustomEvent('gev:layer-finder-clear'));
   row.scrollIntoView({ block: 'center', behavior: 'smooth' });
   row.classList.remove('gev-voice-focus');
   void row.offsetWidth;