diff --git a/static/components/customer-stall/customer-stall.html b/static/components/customer-stall/customer-stall.html
index 6075b56..c423349 100644
--- a/static/components/customer-stall/customer-stall.html
+++ b/static/components/customer-stall/customer-stall.html
@@ -9,8 +9,8 @@
       @open-checkout="openCheckout"></shopping-cart>
   </q-toolbar>
    -->
-  <div class="row">
-    <div class="col-12 auto-width" v-if="productDetail && product">
+  <div  v-if="productDetail && product" class="row">
+    <div class="col-12 auto-width">
       <q-card>
         <q-card-section>
           <product-detail :product="product" @add-to-cart="addToCart"></product-detail>
diff --git a/static/js/market.js b/static/js/market.js
index 65c978d..8f6eaa0 100644
--- a/static/js/market.js
+++ b/static/js/market.js
@@ -435,25 +435,22 @@ const market = async () => {
           url.searchParams.set('merchant_pubkey', pubkey)
         }
 
-        switch (page) {
-          case 'stall':
-            if (stall) {
-              this.activeStall = stall
-              url.searchParams.set('stall_id', stall)
+        if (page === 'stall' || page === 'product') {
+          if (stall) {
+            this.activeStall = stall
+            url.searchParams.set('stall_id', stall)
 
-              this.activeProduct = product
-              if (product) {
-                url.searchParams.set('product_id', product)
-              }
+            this.activeProduct = product
+            if (product) {
+              url.searchParams.set('product_id', product)
             }
-            break
-          default:
-            this.activeStall = null
-            this.activeProduct = null
-            url.searchParams.delete('merchant_pubkey')
-            url.searchParams.delete('stall_id')
-            url.searchParams.delete('product_id')
-            break
+          }
+        } else {
+          this.activeStall = null
+          this.activeProduct = null
+          url.searchParams.delete('merchant_pubkey')
+          url.searchParams.delete('stall_id')
+          url.searchParams.delete('product_id')
         }
 
         window.history.pushState({}, '', url)
diff --git a/templates/nostrmarket/market.html b/templates/nostrmarket/market.html
index ff3ef51..9892b32 100644
--- a/templates/nostrmarket/market.html
+++ b/templates/nostrmarket/market.html
@@ -191,7 +191,7 @@
         <q-breadcrumbs-el v-if="activeStall" :label="stallName" @click="navigateTo('stall', {stall: activeStall})"
           icon="widgets" class="cursor-pointer"></q-breadcrumbs-el>
         <q-breadcrumbs-el v-if="activeProduct" :label="productName"
-          @click="navigateTo('product', {product: activeStall})" class="cursor-pointer"
+          @click="navigateTo('product', {stall: activeStall, product: activeProduct})" class="cursor-pointer"
           icon="widgets"></q-breadcrumbs-el>
       </q-breadcrumbs>
     </div>