diff --git a/layouts/partials/sidebar-v2.html b/layouts/partials/sidebar-v2.html
index 24924016..7838e5c7 100644
--- a/layouts/partials/sidebar-v2.html
+++ b/layouts/partials/sidebar-v2.html
@@ -9,16 +9,16 @@
           </label>
         </div>
 
-        {{ $relPermalink := .RelPermalink }}
+        {{ $relPermalink := (urls.Parse .RelPermalink).Path }}
         {{ $currentProductTitle := "" }}
 
         {{ with index .Site.Data "product-selector" }}
           {{ range $group := . }}
             {{ range $product := $group.products }}
               {{ if not $product.extUrl }}
-              {{ warnf "$relPermalink: %s" $relPermalink }}
-              {{ warnf "$product.url: %s" $product.url }}
-                {{ if strings.Contains $relPermalink $product.url }}
+                {{ $escaped := replace $product.url "/" "\\/" }}
+                {{ $pattern := printf "/%s(/|$)" $escaped }}
+                {{ if strings.FindRE $pattern $relPermalink }}
                   {{ $currentProductTitle = $product.title }}
                 {{ end }}
               {{ end }}
@@ -27,6 +27,7 @@
         {{ end }}
 
 
+
         <div class="product-selector">
             <details class="product-selector__section">
                 <summary class="product-selector__toggle">