diff --git a/src/modules/market/components/ProductCard.vue b/src/modules/market/components/ProductCard.vue
index 532c074..21ef2a0 100644
--- a/src/modules/market/components/ProductCard.vue
+++ b/src/modules/market/components/ProductCard.vue
@@ -101,7 +101,6 @@
 
 <script setup lang="ts">
 import { ref } from 'vue'
-import { useMarketStore } from '@/modules/market/stores/market'
 import { Card, CardContent, CardFooter, CardTitle } from '@/components/ui/card'
 import { Button } from '@/components/ui/button'
 import { Badge } from '@/components/ui/badge'
@@ -114,16 +113,16 @@ interface Props {
 
 const props = defineProps<Props>()
 
-// const emit = defineEmits<{
-//   'view-details': [product: Product]
-//   'view-stall': [stallId: string]
-// }>()
+const emit = defineEmits<{
+  'add-to-cart': [product: Product]
+  'view-details': [product: Product]
+  'view-stall': [stallId: string]
+}>()
 
-const marketStore = useMarketStore()
 const imageError = ref(false)
 
 const addToCart = () => {
-  marketStore.addToStallCart(props.product, 1)
+  emit('add-to-cart', props.product)
 }
 
 const handleImageError = () => {
diff --git a/src/modules/market/components/ProductGrid.vue b/src/modules/market/components/ProductGrid.vue
index 0b64868..d5d421f 100644
--- a/src/modules/market/components/ProductGrid.vue
+++ b/src/modules/market/components/ProductGrid.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="product-grid-container">
     <!-- Loading State -->
     <div v-if="isLoading" class="flex justify-center items-center min-h-64">
       <div class="flex flex-col items-center space-y-4">
@@ -23,18 +23,28 @@
         v-for="product in products"
         :key="product.id"
         :product="product as Product"
-        @add-to-cart="$emit('add-to-cart', $event)"
-        @view-details="$emit('view-details', $event)"
+        @add-to-cart="handleAddToCart"
+        @view-details="handleViewDetails"
         @view-stall="$emit('view-stall', $event)"
       />
     </div>
+
+    <!-- Product Detail Dialog - Now managed internally -->
+    <ProductDetailDialog
+      v-if="selectedProduct"
+      :product="selectedProduct"
+      :isOpen="showProductDetail"
+      @close="closeProductDetail"
+      @add-to-cart="handleDialogAddToCart"
+    />
   </div>
 </template>
 
 <script setup lang="ts">
-import { computed } from 'vue'
+import { computed, ref } from 'vue'
 import { Package as EmptyIcon } from 'lucide-vue-next'
 import ProductCard from './ProductCard.vue'
+import ProductDetailDialog from './ProductDetailDialog.vue'
 import type { Product } from '../types/market'
 
 interface Props {
@@ -66,9 +76,8 @@ const props = withDefaults(defineProps<Props>(), {
   })
 })
 
-defineEmits<{
-  'add-to-cart': [product: Product]
-  'view-details': [product: Product]
+const emit = defineEmits<{
+  'add-to-cart': [product: Product, quantity?: number]
   'view-stall': [stallId: string]
 }>()
 
@@ -89,4 +98,30 @@ const gridClasses = computed(() => {
 
   return classes.join(' ')
 })
+
+// Internal state for product detail dialog
+const showProductDetail = ref(false)
+const selectedProduct = ref<Product | null>(null)
+
+// Handle view details internally
+const handleViewDetails = (product: Product) => {
+  selectedProduct.value = product
+  showProductDetail.value = true
+}
+
+const closeProductDetail = () => {
+  showProductDetail.value = false
+  selectedProduct.value = null
+}
+
+// Handle add to cart from product card (quick add, quantity 1)
+const handleAddToCart = (product: Product) => {
+  emit('add-to-cart', product, 1)
+}
+
+// Handle add to cart from dialog (with custom quantity)
+const handleDialogAddToCart = (product: Product, quantity: number) => {
+  emit('add-to-cart', product, quantity)
+  closeProductDetail()
+}
 </script>
\ No newline at end of file
diff --git a/src/modules/market/views/MarketPage.vue b/src/modules/market/views/MarketPage.vue
index fa86a8f..82de5cb 100644
--- a/src/modules/market/views/MarketPage.vue
+++ b/src/modules/market/views/MarketPage.vue
@@ -78,7 +78,6 @@
         empty-title="No products found"
         empty-message="Try adjusting your search or filters"
         @add-to-cart="addToCart"
-        @view-details="viewProduct"
         @view-stall="viewStall"
       />
 
@@ -91,14 +90,6 @@
       </div>
     </div>
 
-    <!-- Product Detail Dialog -->
-    <ProductDetailDialog
-      v-if="selectedProduct"
-      :product="selectedProduct"
-      :isOpen="showProductDetail"
-      @close="closeProductDetail"
-      @add-to-cart="handleAddToCart"
-    />
   </div>
 </template>
 
@@ -116,7 +107,6 @@ import { ShoppingCart } from 'lucide-vue-next'
 import MarketFuzzySearch from '../components/MarketFuzzySearch.vue'
 import ProductGrid from '../components/ProductGrid.vue'
 import CategoryFilterBar from '../components/CategoryFilterBar.vue'
-import ProductDetailDialog from '../components/ProductDetailDialog.vue'
 import type { Product } from '../types/market'
 import type { FuzzySearchOptions } from '@/composables/useFuzzySearch'
 
@@ -149,9 +139,6 @@ let unsubscribe: (() => void) | null = null
 // Fuzzy search state
 const searchResults = ref<Product[]>([])
 
-// Product detail dialog state
-const showProductDetail = ref(false)
-const selectedProduct = ref<Product | null>(null)
 
 // Fuzzy search configuration for products and stalls
 const searchOptions: FuzzySearchOptions<Product> = {
@@ -252,24 +239,10 @@ const retryLoadMarket = () => {
   loadMarket()
 }
 
-const addToCart = (product: any) => {
-  marketStore.addToCart(product)
+const addToCart = (product: Product, quantity?: number) => {
+  marketStore.addToStallCart(product, quantity || 1)
 }
 
-const viewProduct = (product: Product) => {
-  selectedProduct.value = product
-  showProductDetail.value = true
-}
-
-const closeProductDetail = () => {
-  showProductDetail.value = false
-  selectedProduct.value = null
-}
-
-const handleAddToCart = (product: Product, quantity: number) => {
-  marketStore.addToCart({ ...product, quantity })
-  closeProductDetail()
-}
 
 const viewStall = (stallId: string) => {
   // Navigate to the stall view page
diff --git a/src/modules/market/views/StallView.vue b/src/modules/market/views/StallView.vue
index 5b18df3..e557d14 100644
--- a/src/modules/market/views/StallView.vue
+++ b/src/modules/market/views/StallView.vue
@@ -126,18 +126,10 @@
       :empty-message="searchQuery || selectedCategories.length > 0
         ? 'Try adjusting your filters or search terms'
         : 'This stall doesn\'t have any products yet'"
-      @view-details="viewProductDetails"
       @view-stall="viewStall"
-    />
-
-    <!-- Product Detail Dialog -->
-    <ProductDetailDialog
-      v-if="selectedProduct"
-      :product="selectedProduct"
-      :isOpen="showProductDetail"
-      @close="closeProductDetail"
       @add-to-cart="handleAddToCart"
     />
+
   </div>
 </template>
 
@@ -158,7 +150,6 @@ import {
 import { ArrowLeft, Store, X } from 'lucide-vue-next'
 import FuzzySearch from '@/components/ui/fuzzy-search/FuzzySearch.vue'
 import ProductGrid from '../components/ProductGrid.vue'
-import ProductDetailDialog from '../components/ProductDetailDialog.vue'
 import type { Product, Stall } from '../types/market'
 import type { FuzzySearchOptions } from '@/composables/useFuzzySearch'
 
@@ -172,8 +163,6 @@ const searchResults = ref<Product[]>([])
 const searchQuery = ref('')
 const sortBy = ref('name')
 const selectedCategories = ref<string[]>([])
-const showProductDetail = ref(false)
-const selectedProduct = ref<Product | null>(null)
 const logoError = ref(false)
 
 // Fuzzy search configuration for stall products
@@ -280,20 +269,10 @@ const handleSearchResults = (results: Product[]) => {
   // For now, we'll track it separately
 }
 
-const viewProductDetails = (product: Product) => {
-  selectedProduct.value = product
-  showProductDetail.value = true
+const handleAddToCart = (product: Product, quantity?: number) => {
+  marketStore.addToStallCart(product, quantity || 1)
 }
 
-const closeProductDetail = () => {
-  showProductDetail.value = false
-  selectedProduct.value = null
-}
-
-const handleAddToCart = (product: Product, quantity: number) => {
-  marketStore.addToStallCart(product, quantity)
-  closeProductDetail()
-}
 
 const viewStall = (otherStallId: string) => {
   if (otherStallId !== stallId.value) {
@@ -322,7 +301,6 @@ watch(() => route.params.stallId, (newStallId) => {
   if (newStallId && newStallId !== stallId.value) {
     // Reset filters when navigating to a different stall
     clearFilters()
-    closeProductDetail()
   }
 })
 </script>