diff --git a/src/components/CategoryHero.tsx b/src/components/CategoryHero.tsx
index 77848a5..91b3600 100644
--- a/src/components/CategoryHero.tsx
+++ b/src/components/CategoryHero.tsx
@@ -35,7 +35,7 @@ export function CategoryHero({
           {limited && (
             <span className="inline-flex items-center gap-1 rounded-full bg-[#b45309] text-white text-[10px] font-bold uppercase tracking-wider px-2.5 py-1">
               <Clock3 className="size-3" />
-              This week in {content.title}
+              Filter on · This week only
             </span>
           )}
         </div>
@@ -51,6 +51,7 @@ export function CategoryHero({
             <span className="text-white/55">
               {' '}
               · {productCount} {productCount === 1 ? 'piece' : 'pieces'}
+              {limited ? ' this week' : ''}
             </span>
           ) : null}
         </p>
diff --git a/src/components/Layout.tsx b/src/components/Layout.tsx
index aa751c0..10a30b2 100644
--- a/src/components/Layout.tsx
+++ b/src/components/Layout.tsx
@@ -1,4 +1,4 @@
-import { Link, Outlet, useLocation } from 'react-router-dom'
+import { Link, Outlet, useLocation, useSearchParams } from 'react-router-dom'
 import { Menu, X } from 'lucide-react'
 import { useState } from 'react'
 import { formatExpiry, limitedTimeCopy } from '../data/catalog'
@@ -24,26 +24,48 @@ function navClass(active: boolean) {
 export function Layout() {
   const [open, setOpen] = useState(false)
   const { pathname } = useLocation()
-  const limited = limitedTimeCopy()
-  const until = formatExpiry(limited.expiresAt ?? undefined)
+  const [searchParams] = useSearchParams()
+  const drop = limitedTimeCopy()
+  const until = formatExpiry(drop.expiresAt ?? undefined)
+  const onShop = pathname === '/shop' || pathname.startsWith('/shop')
+  const limitedMode = onShop && searchParams.get('limited') === '1'
+  // When already filtering to this week, offer escape — not another trap door
+  const weekCta = limitedMode
+    ? { to: '/shop', label: 'Full collection', primary: false as const }
+    : { to: '/shop?limited=1', label: 'This week', primary: true as const }
 
   return (
     <div className="min-h-screen flex flex-col">
       <GlobalSeo />
-      <div className="bg-moss text-paper text-center text-[11px] sm:text-xs py-2.5 px-4 font-medium tracking-wide">
-        <Link
-          to="/shop?limited=1"
-          className="hover:underline underline-offset-2"
-        >
-          <span className="font-semibold text-gold">This week’s selection</span>
-          {limited.count > 0 ? ` · ${limited.count} pieces` : ''}
-          {until ? ` · Until ${until}` : ''}
-          <span className="text-paper/70">
-            {' '}
-            · {BRAND.mottoEn}
-          </span>
-        </Link>
-      </div>
+      {limitedMode ? (
+        <div className="bg-[#9a3412] text-white text-center text-[11px] sm:text-xs py-2.5 px-4 font-medium tracking-wide">
+          <span className="font-semibold">Filter on · This week only</span>
+          {drop.count > 0 ? ` · ${drop.count} pieces` : ''}
+          <span className="text-white/75"> · not the full house</span>
+          {' · '}
+          <Link
+            to="/shop"
+            className="font-bold underline underline-offset-2 hover:text-gold"
+          >
+            Show full collection
+          </Link>
+        </div>
+      ) : (
+        <div className="bg-moss text-paper text-center text-[11px] sm:text-xs py-2.5 px-4 font-medium tracking-wide">
+          <Link
+            to="/shop?limited=1"
+            className="hover:underline underline-offset-2"
+          >
+            <span className="font-semibold text-gold">This week’s selection</span>
+            {drop.count > 0 ? ` · ${drop.count} pieces` : ''}
+            {until ? ` · Until ${until}` : ''}
+            <span className="text-paper/70">
+              {' '}
+              · {BRAND.mottoEn}
+            </span>
+          </Link>
+        </div>
+      )}
 
       <header className="sticky top-0 z-50 bg-paper/92 backdrop-blur-xl border-b border-line shadow-[0_1px_0_rgba(26,20,24,0.04)]">
         <div className="mx-auto max-w-7xl px-4 sm:px-6 h-16 sm:h-[4.75rem] flex items-center justify-between gap-3 sm:gap-4">
@@ -74,10 +96,14 @@ export function Layout() {
 
           <div className="flex items-center gap-2 shrink-0">
             <Link
-              to="/shop?limited=1"
-              className="btn-primary !px-3.5 sm:!px-4 !py-2.5 text-xs"
+              to={weekCta.to}
+              className={
+                weekCta.primary
+                  ? 'btn-primary !px-3.5 sm:!px-4 !py-2.5 text-xs'
+                  : 'inline-flex items-center justify-center rounded-full border-2 border-[#9a3412] text-[#9a3412] bg-white px-3.5 sm:px-4 py-2.5 text-xs font-bold hover:bg-[#fff7ed] transition'
+              }
             >
-              This week
+              {weekCta.label}
             </Link>
             <button
               type="button"
@@ -108,11 +134,15 @@ export function Layout() {
               </Link>
             ))}
             <Link
-              to="/shop?limited=1"
-              className="block px-3 py-2.5 rounded-xl font-semibold text-ink hover:bg-paper-2"
+              to={weekCta.to}
+              className={`block px-3 py-2.5 rounded-xl font-semibold ${
+                limitedMode
+                  ? 'bg-[#fff7ed] text-[#9a3412]'
+                  : 'text-ink hover:bg-paper-2'
+              }`}
               onClick={() => setOpen(false)}
             >
-              This week
+              {weekCta.label}
             </Link>
             <Link
               to="/reels"
diff --git a/src/pages/Shop.tsx b/src/pages/Shop.tsx
index a018216..31b4a1f 100644
--- a/src/pages/Shop.tsx
+++ b/src/pages/Shop.tsx
@@ -1,6 +1,6 @@
 import { useEffect, useMemo, useRef } from 'react'
 import { useSearchParams } from 'react-router-dom'
-import { Clock3 } from 'lucide-react'
+import { Clock3, Search, X } from 'lucide-react'
 import { trackShopFilter } from '../lib/analytics'
 import {
   CATEGORY_LABELS,
@@ -62,6 +62,8 @@ export function Shop() {
   const until = formatExpiry(drop.expiresAt ?? undefined)
   const categoryHero = getCategoryHero(cat || null)
   const showCategoryHero = Boolean(cat && categoryHero)
+  const houseTotal = shopProducts.length
+  const catLabel = cat ? CATEGORY_LABELS[cat as Category] : null
 
   function updateParams(patch: Record<string, string | null>) {
     const next = new URLSearchParams(params)
@@ -73,12 +75,11 @@ export function Shop() {
     setParams(next, { replace: true })
   }
 
+  function clearAllFilters() {
+    setParams({}, { replace: true })
+  }
+
   const hasFilters = Boolean(cat || q || limited)
-  const contextLabel = cat
-    ? CATEGORY_LABELS[cat as Category]
-    : limited
-      ? 'This week'
-      : 'All categories'
 
   return (
     <div className="pb-28">
@@ -104,54 +105,128 @@ export function Shop() {
             </h1>
             <p className="text-ink-soft mt-3 max-w-xl text-lg font-light leading-relaxed">
               {limited
-                ? 'A short selection. It will not last. Discover here; complete your purchase on Amazon.'
+                ? `You’re viewing a short weekly list — ${filtered.length} of ${houseTotal} pieces in the house.`
                 : 'Every room of the house — for treating yourself, or for the woman you love. Discover here; complete your purchase on Amazon.'}
             </p>
+          </>
+        )}
 
-            {limited && (
-              <div className="mt-6 rounded-2xl border border-[#fdba74] bg-[#fff7ed] px-5 py-4 flex flex-wrap items-center gap-3">
-                <Clock3 className="size-5 text-[#9a3412] shrink-0" />
-                <div className="text-sm text-[#9a3412]">
-                  <p className="font-bold uppercase tracking-wide text-[11px]">
-                    {drop.headline}
-                  </p>
-                  <p className="mt-0.5">
-                    {drop.count} options in this drop
-                    {until ? ` · Rotates ${until}` : ''}
-                  </p>
-                </div>
+        {/* Unmistakable limited-mode banner — always when ?limited=1 */}
+        {limited && (
+          <div
+            role="status"
+            aria-live="polite"
+            className={`${showCategoryHero ? 'mt-0' : 'mt-6'} rounded-2xl border-2 border-[#c2410c] bg-[#fff7ed] px-4 sm:px-5 py-4 flex flex-col sm:flex-row sm:items-center gap-3 sm:gap-4 shadow-[0_8px_30px_-16px_rgba(154,52,18,0.35)]`}
+          >
+            <div className="flex items-start gap-3 flex-1 min-w-0">
+              <span className="mt-0.5 flex size-9 shrink-0 items-center justify-center rounded-full bg-[#9a3412] text-white">
+                <Clock3 className="size-4" aria-hidden />
+              </span>
+              <div className="min-w-0">
+                <p className="text-[11px] font-bold uppercase tracking-[0.16em] text-[#9a3412]">
+                  Filter on · This week only
+                </p>
+                <p className="mt-1 text-sm text-[#9a3412]/95 leading-snug">
+                  Showing{' '}
+                  <strong className="font-semibold">
+                    {filtered.length}{' '}
+                    {filtered.length === 1 ? 'piece' : 'pieces'}
+                  </strong>
+                  {catLabel ? (
+                    <>
+                      {' '}
+                      in <strong className="font-semibold">{catLabel}</strong>
+                    </>
+                  ) : null}
+                  {' '}
+                  — not the full house ({houseTotal}).
+                  {until ? ` Rotates ${until}.` : ''}
+                </p>
               </div>
+            </div>
+            <button
+              type="button"
+              onClick={() => updateParams({ limited: null })}
+              className="shrink-0 inline-flex items-center justify-center gap-1.5 rounded-full bg-[#9a3412] text-white px-4 py-2.5 text-sm font-bold hover:bg-[#7c2d12] transition"
+            >
+              <X className="size-3.5" aria-hidden />
+              Turn off This week
+            </button>
+          </div>
+        )}
+
+        {/* Active filter chips */}
+        {hasFilters && (
+          <div
+            className={`${limited || !showCategoryHero ? 'mt-4' : 'mt-0'} flex flex-wrap items-center gap-2`}
+            aria-label="Active filters"
+          >
+            <span className="text-[11px] font-bold uppercase tracking-[0.14em] text-muted mr-1">
+              Filtering
+            </span>
+            {limited && (
+              <FilterChip
+                label="This week only"
+                tone="limited"
+                onRemove={() => updateParams({ limited: null })}
+              />
             )}
-          </>
+            {catLabel && (
+              <FilterChip
+                label={catLabel}
+                onRemove={() => updateParams({ cat: null })}
+              />
+            )}
+            {q && (
+              <FilterChip
+                label={`“${q}”`}
+                onRemove={() => updateParams({ q: null })}
+              />
+            )}
+            <button
+              type="button"
+              onClick={clearAllFilters}
+              className="text-sm font-semibold text-bamboo hover:underline underline-offset-2 ml-1"
+            >
+              Clear all
+            </button>
+          </div>
         )}
 
         <div
           className={`mb-6 flex flex-wrap gap-3 items-center ${
-            showCategoryHero ? '' : 'mt-8'
+            hasFilters || limited ? 'mt-5' : showCategoryHero ? '' : 'mt-8'
           }`}
         >
           <label className="sr-only" htmlFor="search">
             Search
           </label>
-          <input
-            id="search"
-            type="search"
-            value={q}
-            onChange={(e) => updateParams({ q: e.target.value || null })}
-            placeholder="Search products…"
-            className="w-full max-w-md rounded-2xl border border-line bg-card px-4 py-3.5 text-sm font-medium outline-none focus:border-focus:ring-2 focus:ring-bamboo/15"
-          />
+          <div className="relative w-full max-w-md">
+            <Search
+              className="pointer-events-none absolute left-3.5 top-1/2 -translate-y-1/2 size-4 text-muted"
+              aria-hidden
+            />
+            <input
+              id="search"
+              type="search"
+              value={q}
+              onChange={(e) => updateParams({ q: e.target.value || null })}
+              placeholder="Search the house…"
+              className="w-full rounded-2xl border border-line bg-card pl-10 pr-4 py-3.5 text-sm font-medium outline-none focus:border-bamboo focus:ring-2 focus:ring-bamboo/15"
+            />
+          </div>
           <button
             type="button"
+            aria-pressed={limited}
             onClick={() => updateParams({ limited: limited ? null : '1' })}
-            className={`rounded-full px-4 py-2.5 text-sm font-semibold transition inline-flex items-center gap-1.5 ${
+            className={`rounded-full px-4 py-2.5 text-sm font-semibold transition inline-flex items-center gap-1.5 border-2 ${
               limited
-                ? 'bg-[#9a3412] text-white'
-                : 'bg-card border border-line hover:border-[#9a3412]/40 text-[#9a3412]'
+                ? 'bg-[#9a3412] border-[#9a3412] text-white shadow-sm ring-2 ring-[#9a3412]/25'
+                : 'bg-card border-line text-[#9a3412] hover:border-[#9a3412]/50'
             }`}
           >
-            <Clock3 className="size-3.5" />
-            Limited time only
+            <Clock3 className="size-3.5" aria-hidden />
+            {limited ? 'This week · On' : 'This week only'}
           </button>
         </div>
 
@@ -166,7 +241,7 @@ export function Shop() {
                 : 'bg-card border border-line hover:border-bamboo/40'
             }`}
           >
-            All categories
+            All rooms
           </button>
           {CATEGORY_OPTIONS.map((c) => (
             <button
@@ -188,20 +263,34 @@ export function Shop() {
           ))}
         </div>
 
-        <div className="flex items-center justify-between gap-4 mb-6">
+        <div className="flex flex-wrap items-center justify-between gap-3 mb-6">
           <p className="text-sm font-semibold text-ink-soft">
-            Showing: {contextLabel}
-            {' · '}
-            {filtered.length} {filtered.length === 1 ? 'product' : 'products'}
-            {!hasFilters ? ` · ${shopProducts.length} in the house` : ''}
+            {limited ? (
+              <>
+                <span className="text-[#9a3412]">This week</span>
+                {catLabel ? ` · ${catLabel}` : ''}
+                {q ? ` · “${q}”` : ''}
+                {' · '}
+                {filtered.length} of {houseTotal} in the house
+              </>
+            ) : (
+              <>
+                {catLabel || 'All rooms'}
+                {q ? ` · “${q}”` : ''}
+                {' · '}
+                {filtered.length}{' '}
+                {filtered.length === 1 ? 'product' : 'products'}
+                {!hasFilters ? ` · ${houseTotal} in the house` : ''}
+              </>
+            )}
           </p>
           {hasFilters && (
             <button
               type="button"
-              onClick={() => setParams({}, { replace: true })}
-              className="text-sm font-semibold text-bamboo"
+              onClick={clearAllFilters}
+              className="text-sm font-semibold text-bamboo hover:underline underline-offset-2"
             >
-              Clear filters
+              Clear filters · full house
             </button>
           )}
         </div>
@@ -214,16 +303,29 @@ export function Shop() {
         {filtered.length === 0 ? (
           <div className="rounded-2xl border border-line bg-card p-14 text-center">
             <p className="font-display text-2xl font-semibold">No matches</p>
-            <p className="text-ink-soft mt-2">
-              Try another room or clear search / limited filter.
+            <p className="text-ink-soft mt-2 max-w-md mx-auto">
+              {limited
+                ? 'Nothing in this week’s list matches. Turn off “This week” or clear filters to see the full house.'
+                : 'Try another room or clear search.'}
             </p>
-            <button
-              type="button"
-              onClick={() => setParams({}, { replace: true })}
-              className="btn-primary mt-6"
-            >
-              Show all products
-            </button>
+            <div className="mt-6 flex flex-wrap justify-center gap-3">
+              {limited && (
+                <button
+                  type="button"
+                  onClick={() => updateParams({ limited: null })}
+                  className="btn-primary"
+                >
+                  Turn off This week
+                </button>
+              )}
+              <button
+                type="button"
+                onClick={clearAllFilters}
+                className={limited ? 'btn-secondary' : 'btn-primary'}
+              >
+                Show full collection
+              </button>
+            </div>
           </div>
         ) : (
           <ProductGrid
@@ -251,3 +353,37 @@ export function Shop() {
     </div>
   )
 }
+
+function FilterChip({
+  label,
+  onRemove,
+  tone = 'default',
+}: {
+  label: string
+  onRemove: () => void
+  tone?: 'default' | 'limited'
+}) {
+  const limited = tone === 'limited'
+  return (
+    <button
+      type="button"
+      onClick={onRemove}
+      className={`inline-flex items-center gap-1.5 rounded-full pl-3 pr-2 py-1.5 text-xs font-bold transition ${
+        limited
+          ? 'bg-[#9a3412] text-white hover:bg-[#7c2d12]'
+          : 'bg-ink text-paper hover:bg-charcoal'
+      }`}
+      aria-label={`Remove filter: ${label}`}
+    >
+      {limited && <Clock3 className="size-3" aria-hidden />}
+      <span className="max-w-[14rem] truncate">{label}</span>
+      <span
+        className={`flex size-5 items-center justify-center rounded-full ${
+          limited ? 'bg-white/20' : 'bg-white/15'
+        }`}
+      >
+        <X className="size-3" aria-hidden />
+      </span>
+    </button>
+  )
+}