diff --git a/src/Resources/app/storefront/src/scss/base.scss b/src/Resources/app/storefront/src/scss/base.scss
index 7c8a19a..58f3d78 100644
--- a/src/Resources/app/storefront/src/scss/base.scss
+++ b/src/Resources/app/storefront/src/scss/base.scss
@@ -71,8 +71,15 @@ strong {
       text-align: center;
       margin-top: 0.25rem;
 
-      @include media-breakpoint-down(sm) {
-        display: none;
+      // @deprecated tag:v6.5.0 - Bootstrap v5 changes media-breakpoint-down behavior
+      @if feature('v6.5.0.0') {
+        @include media-breakpoint-down(md) {
+          display: none;
+        }
+      } @else {
+        @include media-breakpoint-down(sm) {
+          display: none;
+        }
       }
     }
   }
@@ -180,7 +187,8 @@ strong {
 
   .header-search {
     .header-search-input,
-    .input-group-append {
+    .input-group-append,
+    .header-search-btn {
       height: 37px;
     }
 
diff --git a/src/Resources/views/storefront/component/product/card/action.html.twig b/src/Resources/views/storefront/component/product/card/action.html.twig
index 05066b7..816c808 100644
--- a/src/Resources/views/storefront/component/product/card/action.html.twig
+++ b/src/Resources/views/storefront/component/product/card/action.html.twig
@@ -1,9 +1,19 @@
 {% sw_extends '@Storefront/storefront/component/product/card/action.html.twig' %}
 
 {% block component_product_box_action_detail %}
-  <a href="{{ seoUrl('frontend.detail.page', {'productId': id}) }}"
-     class="btn btn-block btn-buy"
-     title="{{ "listing.boxProductDetails"|trans|striptags }}">
-    {{ "listing.boxProductDetails"|trans|sw_sanitize }}
-  </a>
+    {% if feature('v6.5.0.0') %}
+        <div class="d-grid">
+            <a href="{{ seoUrl('frontend.detail.page', {'productId': id}) }}"
+               class="btn btn-buy"
+               title="{{ "listing.boxProductDetails"|trans|striptags }}">
+                {{ "listing.boxProductDetails"|trans|sw_sanitize }}
+            </a>
+        </div>
+    {% else %}
+        <a href="{{ seoUrl('frontend.detail.page', {'productId': id}) }}"
+           class="btn btn-block btn-buy"
+           title="{{ "listing.boxProductDetails"|trans|striptags }}">
+            {{ "listing.boxProductDetails"|trans|sw_sanitize }}
+        </a>
+    {% endif %}
 {% endblock %}