diff --git a/assets/views/shop/_product_grid.html b/assets/views/shop/_product_grid.html
index 48da173..390b7a3 100644
--- a/assets/views/shop/_product_grid.html
+++ b/assets/views/shop/_product_grid.html
@@ -1,39 +1,9 @@
-{# Product collection with a grid / list view toggle.
-   The chosen view is held in Alpine and persisted to localStorage so it
-   survives navigation; `_card.html` reads the same `view` state to switch
-   its own layout between a vertical card and a horizontal row. #}
-<div x-data="{ view: localStorage.getItem('shopView') === 'list' ? 'list' : 'grid' }"
-  x-init="$watch('view', v => localStorage.setItem('shopView', v))"
-  class="space-y-4">
-  <!-- View toggle -->
-  <div class="flex justify-end">
-    <div class="inline-flex gap-0.5 rounded-radius border border-outline p-0.5 dark:border-outline-dark" role="group"
-      aria-label="{{ t(key='view-grid', lang=lang | default(value='sk')) }} / {{ t(key='view-list', lang=lang | default(value='sk')) }}">
-      <button type="button" @click="view = 'grid'" :aria-pressed="view === 'grid'"
-        class="inline-flex size-8 items-center justify-center rounded-radius transition"
-        :class="view === 'grid' ? 'bg-primary text-on-primary dark:bg-primary-dark dark:text-on-primary-dark' : 'text-on-surface hover:text-primary dark:text-on-surface-dark dark:hover:text-primary-dark'"
-        aria-label="{{ t(key='view-grid', lang=lang | default(value='sk')) }}"
-        title="{{ t(key='view-grid', lang=lang | default(value='sk')) }}">
-        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true" class="size-4">
-          <path d="M3 3h6v6H3V3Zm8 0h6v6h-6V3ZM3 11h6v6H3v-6Zm8 0h6v6h-6v-6Z" />
-        </svg>
-      </button>
-      <button type="button" @click="view = 'list'" :aria-pressed="view === 'list'"
-        class="inline-flex size-8 items-center justify-center rounded-radius transition"
-        :class="view === 'list' ? 'bg-primary text-on-primary dark:bg-primary-dark dark:text-on-primary-dark' : 'text-on-surface hover:text-primary dark:text-on-surface-dark dark:hover:text-primary-dark'"
-        aria-label="{{ t(key='view-list', lang=lang | default(value='sk')) }}"
-        title="{{ t(key='view-list', lang=lang | default(value='sk')) }}">
-        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true" class="size-4">
-          <path d="M3 4h14v2.5H3V4Zm0 4.75h14v2.5H3v-2.5ZM3 13.5h14V16H3v-2.5Z" />
-        </svg>
-      </button>
-    </div>
-  </div>
-
-  <!-- Products -->
-  <div :class="view === 'list' ? 'flex flex-col gap-5' : 'grid grid-cols-2 gap-5 sm:grid-cols-3 xl:grid-cols-4'">
-    {% for product in products %}
-    {% include "shop/_card.html" %}
-    {% endfor %}
-  </div>
+{# Product collection. The grid / list `view` state is provided by the Alpine
+   wrapper in _search.html (it persists across htmx swaps and is shared with the
+   sort + view-toggle row); `_card.html` reads the same `view` to switch its own
+   layout between a vertical card and a horizontal row. #}
+<div :class="view === 'list' ? 'flex flex-col gap-5' : 'grid grid-cols-2 gap-5 sm:grid-cols-3 xl:grid-cols-4'">
+  {% for product in products %}
+  {% include "shop/_card.html" %}
+  {% endfor %}
 </div>
diff --git a/assets/views/shop/_results.html b/assets/views/shop/_results.html
index a34f914..178dbb7 100644
--- a/assets/views/shop/_results.html
+++ b/assets/views/shop/_results.html
@@ -3,9 +3,17 @@
    pagination. #}
 {% set L = lang | default(value='sk') %}
 <div class="space-y-4">
-  <p class="text-sm text-on-surface/70 dark:text-on-surface-dark/70" aria-live="polite">
-    {{ t(key="results-count", lang=L, count=total) }}{% if query and query != "" %} · “{{ query }}”{% endif %}
-  </p>
+  <div class="flex flex-wrap items-center justify-between gap-2">
+    <p class="text-sm text-on-surface/70 dark:text-on-surface-dark/70" aria-live="polite">
+      {{ t(key="results-count", lang=L, count=total) }}{% if query and query != "" %} · “{{ query }}”{% endif %}
+    </p>
+    {% if query_base and query_base != "" %}
+    <a href="/shop" hx-get="/search" hx-target="#shop-results" hx-push-url="true"
+      class="text-sm font-medium text-on-surface/70 underline-offset-2 transition hover:text-primary hover:underline dark:text-on-surface-dark/70 dark:hover:text-primary-dark">
+      {{ t(key="filter-clear", lang=L) }}
+    </a>
+    {% endif %}
+  </div>
 
   {% if products | length > 0 %}
   {% include "shop/_product_grid.html" %}
diff --git a/assets/views/shop/_search.html b/assets/views/shop/_search.html
index a05aa20..6aa38e8 100644
--- a/assets/views/shop/_search.html
+++ b/assets/views/shop/_search.html
@@ -1,20 +1,28 @@
-{# Shared storefront search + filter toolbar and results region, used by the shop
-   index and every category page. One form drives the whole listing: htmx re-runs
-   /search and swaps only #shop-results; the toolbar keeps its own DOM state.
-   Triggers: live (debounced) typing in the search box, immediate on any
-   select/checkbox change, and submit (Enter / Apply) for the price band. Degrades
-   to a plain GET form without JS.
-   Expects: query, category_groups, selected_category, selected_category_id,
-   uncategorized_count, sort, min_price, max_price, price_floor, price_ceil,
-   in_stock, plus the result vars consumed by _results.html. #}
+{# Shared storefront search box + results region, used by the shop index and
+   every category page. One form drives the listing: htmx re-runs /search and
+   swaps only #shop-results; the toolbar keeps its own DOM state. Triggers: live
+   (debounced) typing in the search box, immediate on a sort change, and submit
+   (Enter). Degrades to a plain GET form without JS.
+   Category is chosen from the sidebar (carried here as a hidden field so it
+   survives a search / re-sort). The grid/list view toggle lives next to sort;
+   its `view` state is held in Alpine on this wrapper so both the toggle and the
+   swapped-in product grid (and `_card.html`) share it.
+   Expects: query, selected_category, sort, plus the result vars consumed by
+   _results.html. #}
 {% set L = lang | default(value='sk') %}
-<div class="space-y-6">
+<div x-data="{ view: localStorage.getItem('shopView') === 'list' ? 'list' : 'grid' }"
+  x-init="$watch('view', v => localStorage.setItem('shopView', v))"
+  class="space-y-6">
   <form action="/search" method="get" role="search"
     hx-get="/search" hx-target="#shop-results" hx-swap="innerHTML"
     hx-push-url="true" hx-indicator="#search-spinner"
     hx-trigger="submit, change, keyup changed delay:350ms from:input[name='q']"
     class="space-y-3">
 
+    {# Category comes from the sidebar; keep it on the query so searching /
+       re-sorting stays within the active category. #}
+    <input type="hidden" name="category" value="{{ selected_category | default(value='all') }}" />
+
     <!-- search box -->
     <div class="relative max-w-xl">
       <span class="pointer-events-none absolute inset-y-0 left-0 flex items-center pl-3 text-on-surface/50 dark:text-on-surface-dark/50">
@@ -32,28 +40,9 @@
       </span>
     </div>
 
-    <!-- filter toolbar -->
-    <div class="flex flex-wrap items-end gap-3 rounded-radius border border-outline bg-surface-alt p-3 dark:border-outline-dark dark:bg-surface-dark-alt">
-      <!-- category -->
-      <label class="flex flex-col gap-1 text-xs font-medium text-on-surface/70 dark:text-on-surface-dark/70">
-        {{ t(key="filter-category", lang=L) }}
-        <select name="category"
-          class="rounded-radius border border-outline bg-surface px-2 py-1.5 text-sm text-on-surface focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-primary dark:border-outline-dark dark:bg-surface-dark dark:text-on-surface-dark">
-          <option value="all"{% if selected_category == "all" %} selected{% endif %}>{{ t(key="filter-all-categories", lang=L) }}</option>
-          {% for g in category_groups %}
-          <option value="{{ g.id }}"{% if selected_category_id == g.id %} selected{% endif %}>{{ g.name }} ({{ g.count }})</option>
-          {% for ch in g.children %}
-          <option value="{{ ch.id }}"{% if selected_category_id == ch.id %} selected{% endif %}>&nbsp;&nbsp;— {{ ch.name }} ({{ ch.count }})</option>
-          {% endfor %}
-          {% endfor %}
-          {% if uncategorized_count > 0 %}
-          <option value="none"{% if selected_category == "none" %} selected{% endif %}>{{ t(key="filter-uncategorized", lang=L) }} ({{ uncategorized_count }})</option>
-          {% endif %}
-        </select>
-      </label>
-
-      <!-- sort -->
-      <label class="flex flex-col gap-1 text-xs font-medium text-on-surface/70 dark:text-on-surface-dark/70">
+    <!-- sort + product card style switch -->
+    <div class="flex flex-wrap items-center justify-end gap-3">
+      <label class="flex items-center gap-2 text-xs font-medium text-on-surface/70 dark:text-on-surface-dark/70">
         {{ t(key="sort-label", lang=L) }}
         <select name="sort"
           class="rounded-radius border border-outline bg-surface px-2 py-1.5 text-sm text-on-surface focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-primary dark:border-outline-dark dark:bg-surface-dark dark:text-on-surface-dark">
@@ -63,35 +52,27 @@
         </select>
       </label>
 
-      <!-- price band -->
-      <label class="flex flex-col gap-1 text-xs font-medium text-on-surface/70 dark:text-on-surface-dark/70">
-        {{ t(key="filter-price", lang=L) }}{% if currency_symbol %} ({{ currency_symbol }}){% endif %}
-        <span class="flex items-center gap-1">
-          <input type="number" name="min_price" min="0" step="0.01" inputmode="decimal"
-            value="{{ min_price | default(value='') }}" placeholder="{{ price_floor }}"
-            aria-label="{{ t(key='filter-price-from', lang=L) }}"
-            class="w-24 rounded-radius border border-outline bg-surface px-2 py-1.5 text-sm text-on-surface dark:border-outline-dark dark:bg-surface-dark dark:text-on-surface-dark" />
-          <span class="text-on-surface/50 dark:text-on-surface-dark/50">–</span>
-          <input type="number" name="max_price" min="0" step="0.01" inputmode="decimal"
-            value="{{ max_price | default(value='') }}" placeholder="{{ price_ceil }}"
-            aria-label="{{ t(key='filter-price-to', lang=L) }}"
-            class="w-24 rounded-radius border border-outline bg-surface px-2 py-1.5 text-sm text-on-surface dark:border-outline-dark dark:bg-surface-dark dark:text-on-surface-dark" />
-        </span>
-      </label>
-
-      <!-- in stock -->
-      <label class="flex items-center gap-2 pb-1.5 text-sm text-on-surface dark:text-on-surface-dark">
-        <input type="checkbox" name="in_stock" value="1"{% if in_stock %} checked{% endif %}
-          class="size-4 rounded border-outline text-primary focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-primary dark:border-outline-dark dark:text-primary-dark" />
-        {{ t(key="filter-in-stock", lang=L) }}
-      </label>
-
-      <div class="ml-auto flex items-end gap-2">
-        {{ ui::button(label=t(key="filter-apply", lang=L), type="submit", variant="secondary") }}
-        <a href="/shop" hx-get="/search" hx-target="#shop-results" hx-push-url="true"
-          class="self-end pb-1.5 text-sm font-medium text-on-surface/70 underline-offset-2 transition hover:text-primary hover:underline dark:text-on-surface-dark/70 dark:hover:text-primary-dark">
-          {{ t(key="filter-clear", lang=L) }}
-        </a>
+      <!-- grid / list view toggle -->
+      <div class="inline-flex gap-0.5 rounded-radius border border-outline p-0.5 dark:border-outline-dark" role="group"
+        aria-label="{{ t(key='view-grid', lang=L) }} / {{ t(key='view-list', lang=L) }}">
+        <button type="button" @click="view = 'grid'" :aria-pressed="view === 'grid'"
+          class="inline-flex size-8 items-center justify-center rounded-radius transition"
+          :class="view === 'grid' ? 'bg-primary text-on-primary dark:bg-primary-dark dark:text-on-primary-dark' : 'text-on-surface hover:text-primary dark:text-on-surface-dark dark:hover:text-primary-dark'"
+          aria-label="{{ t(key='view-grid', lang=L) }}"
+          title="{{ t(key='view-grid', lang=L) }}">
+          <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true" class="size-4">
+            <path d="M3 3h6v6H3V3Zm8 0h6v6h-6V3ZM3 11h6v6H3v-6Zm8 0h6v6h-6v-6Z" />
+          </svg>
+        </button>
+        <button type="button" @click="view = 'list'" :aria-pressed="view === 'list'"
+          class="inline-flex size-8 items-center justify-center rounded-radius transition"
+          :class="view === 'list' ? 'bg-primary text-on-primary dark:bg-primary-dark dark:text-on-primary-dark' : 'text-on-surface hover:text-primary dark:text-on-surface-dark dark:hover:text-primary-dark'"
+          aria-label="{{ t(key='view-list', lang=L) }}"
+          title="{{ t(key='view-list', lang=L) }}">
+          <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true" class="size-4">
+            <path d="M3 4h14v2.5H3V4Zm0 4.75h14v2.5H3v-2.5ZM3 13.5h14V16H3v-2.5Z" />
+          </svg>
+        </button>
       </div>
     </div>
   </form>