diff --git a/make_post_sell/templates/home.j2 b/make_post_sell/templates/home.j2
index 94c14bd..5dfee8e 100644
--- a/make_post_sell/templates/home.j2
+++ b/make_post_sell/templates/home.j2
@@ -88,7 +88,10 @@
      Layout 0 (flat) keeps its existing simple grid with no nav. #}
   {% set show_facet_nav = request.shop.home_layout and request.shop.home_layout >= 1 %}
 
-  {# MPS-24: tag chip strip — shown on layout 1 (chips) and 2 (lanes). #}
+  {# MPS-24: tag chip strip — shown on layout 1 (chips) and 2 (lanes).
+     Chips and the facet left-nav point at the SAME targets (shop home
+     for "All", {tag_base}/tag/{slug} per category) so the two stay in
+     lock-step. tag_filter.js keeps full navigation for /tag/ hrefs. #}
   {% if home_chips %}
   <nav class="tag-chip-strip" data-tag-strip aria-label="Browse by category">
     <a href="{{ shop_url }}"
@@ -96,7 +99,7 @@
        data-tag-slug=""
        rel="nofollow">All</a>
   {% for chip in home_chips %}
-    <a href="?tag={{ chip.slug }}"
+    <a href="{{ tag_base }}/tag/{{ chip.slug }}"
        class="tag-chip{% if active_tag and active_tag.id == chip.id %} tag-chip-active{% endif %}"
        data-tag-slug="{{ chip.slug }}"
        rel="nofollow">{{ chip.name }}</a>
@@ -121,7 +124,7 @@
   <section class="tag-lane" data-tag-lane="{{ lane.tag.slug }}">
     <header class="tag-lane-header">
       <h2 class="type-title tag-lane-title">{{ lane.tag.name }}</h2>
-      <a href="?tag={{ lane.tag.slug }}" class="tag-lane-more shop-theme-link-color" rel="nofollow">See all &rarr;</a>
+      <a href="{{ tag_base }}/tag/{{ lane.tag.slug }}" class="tag-lane-more shop-theme-link-color" rel="nofollow">See all &rarr;</a>
     </header>
 
     {# Desktop: horizontal tile scroll (Netflix-style). Hidden <800px. #}
diff --git a/make_post_sell/templates/shop.j2 b/make_post_sell/templates/shop.j2
index 7ba79f2..9247bd1 100644
--- a/make_post_sell/templates/shop.j2
+++ b/make_post_sell/templates/shop.j2
@@ -16,6 +16,12 @@
 {% set show_facet_nav = request.shop.home_layout and request.shop.home_layout >= 1 %}
 
 {# MPS-24: tag chip strip — shown on layout 1 (chips) and 2 (lanes). #}
+{# Chip strip and the facet left-nav point at the SAME targets: the
+   shop home for "All" and the canonical tag detail page
+   ({tag_base}/tag/{slug}) per category. tag_filter.js detects the
+   /tag/ href and keeps full navigation, so a chip and its matching
+   sidebar entry always land on the same page with the same active
+   state. #}
 {% if home_chips %}
 <nav class="tag-chip-strip" data-tag-strip aria-label="Browse by category">
   <a href="{{ shop_url }}"
@@ -23,7 +29,7 @@
      data-tag-slug=""
      rel="nofollow">All</a>
 {% for chip in home_chips %}
-  <a href="?tag={{ chip.slug }}"
+  <a href="{{ tag_base }}/tag/{{ chip.slug }}"
      class="tag-chip{% if active_tag and active_tag.id == chip.id %} tag-chip-active{% endif %}"
      data-tag-slug="{{ chip.slug }}"
      rel="nofollow">{{ chip.name }}</a>
@@ -47,7 +53,7 @@
 <section class="tag-lane" data-tag-lane="{{ lane.tag.slug }}">
   <header class="tag-lane-header">
     <h2 class="type-title tag-lane-title">{{ lane.tag.name }}</h2>
-    <a href="?tag={{ lane.tag.slug }}" class="tag-lane-more shop-theme-link-color" rel="nofollow">See all &rarr;</a>
+    <a href="{{ tag_base }}/tag/{{ lane.tag.slug }}" class="tag-lane-more shop-theme-link-color" rel="nofollow">See all &rarr;</a>
   </header>
 
   {# Desktop: horizontal tile scroll. Hidden <800px. #}