diff --git a/BTCPayServer/Views/AppsPublic/ViewPointOfSale.cshtml b/BTCPayServer/Views/AppsPublic/ViewPointOfSale.cshtml
index d2feaae9b..ba25d7eb9 100644
--- a/BTCPayServer/Views/AppsPublic/ViewPointOfSale.cshtml
+++ b/BTCPayServer/Views/AppsPublic/ViewPointOfSale.cshtml
@@ -59,7 +59,7 @@
     </style>
     @if (!string.IsNullOrEmpty(Model.EmbeddedCSS))
     {
-        @Safe.Raw($"<style>{Model.EmbeddedCSS}</style>");   
+        @Safe.Raw($"<style>{Model.EmbeddedCSS}</style>");
     }
 
 </head>
@@ -241,11 +241,11 @@
                     <div class="modal-footer bg-light">
                         <form
                             id="js-cart-pay-form"
-                            method="post" 
-                            asp-controller="AppsPublic" 
-                            asp-action="ViewPointOfSale" 
-                            asp-route-appId="@Model.AppId" 
-                            asp-antiforgery="false" 
+                            method="post"
+                            asp-controller="AppsPublic"
+                            asp-action="ViewPointOfSale"
+                            asp-route-appId="@Model.AppId"
+                            asp-antiforgery="false"
                             data-buy
                         >
                             <input id="js-cart-amount" class="form-control" type="hidden" name="amount">
@@ -264,7 +264,7 @@
             <div id="content">
                 <div class="p-2 p-sm-4">
                     <div class="row">
-                        <div class="col-sm-4 col-lg-3 order-sm-last text-right mb-2">
+                        <div class="col-sm-4 col-lg-2 order-sm-last text-right mb-2">
                             <a class="js-cart btn btn-lg btn-warning text-white text-right" href="#">
                                 <i class="fa fa-shopping-basket"></i>&nbsp;
                                 <span class="badge badge-light badge-pill">
@@ -272,10 +272,10 @@
                                 </span>
                             </a>
                         </div>
-                        <div class="col-sm-8 col-lg-9 mb-2">
-                            <div class="input-group mb-2">
+                        <div class="col-sm-8 col-lg-10 mb-2">
+                            <div class="mb-2 position-relative">
                                 <input type="text" class="js-search form-control form-control-lg" placeholder="Find product">
-                                <a class="js-search-reset btn btn-link text-black" href="#" style="position: absolute; right: 0px; z-index: 1049; display: none;">
+                                <a class="js-search-reset btn btn-lg btn-link text-black" href="#">
                                     <i class="fa fa-times-circle fa-lg"></i>
                                 </a>
                             </div>
diff --git a/BTCPayServer/wwwroot/cart/css/style.css b/BTCPayServer/wwwroot/cart/css/style.css
index 1f3b8720b..f2d347b2f 100644
--- a/BTCPayServer/wwwroot/cart/css/style.css
+++ b/BTCPayServer/wwwroot/cart/css/style.css
@@ -33,10 +33,23 @@
     cursor: pointer;
 }
 
+.js-cart-tip-btn:focus {
+    background-color: #dee2e6;
+}
+
 #js-cart-confirm {
     border-radius: 0;
 }
 
+.js-search-reset {
+    position: absolute;
+    right: 0px;
+    top: 50%;
+    transform: translateY(-50%);
+    z-index: 1049;
+    display: none;
+}
+
 /* ---------------------------------------------------
     SIDEBAR STYLE
 ----------------------------------------------------- */
diff --git a/BTCPayServer/wwwroot/cart/js/cart.jquery.js b/BTCPayServer/wwwroot/cart/js/cart.jquery.js
index acdcdb163..ca4ffebfb 100644
--- a/BTCPayServer/wwwroot/cart/js/cart.jquery.js
+++ b/BTCPayServer/wwwroot/cart/js/cart.jquery.js
@@ -114,6 +114,8 @@ $(document).ready(function(){
             var $list = $('#js-pos-list').find(".card-title:not(:icontains('" + $.escapeSelector(str) + "'))");
             $list.parents('.card-wrapper').hide();
             $('.js-search-reset').show();
+        } else if (str.length === 0) {
+            $('.js-search-reset').hide();
         }
     });