diff --git a/src/modules/market/components/MerchantStore.vue b/src/modules/market/components/MerchantStore.vue
index ae755a9..a0acd1a 100644
--- a/src/modules/market/components/MerchantStore.vue
+++ b/src/modules/market/components/MerchantStore.vue
@@ -759,30 +759,194 @@
 
   <!-- Create Product Dialog -->
   <Dialog v-model:open="showProductDialog">
-    <DialogContent class="sm:max-w-2xl">
+    <DialogContent class="sm:max-w-3xl max-h-[90vh] overflow-y-auto">
       <DialogHeader>
-        <DialogTitle>Add New Product</DialogTitle>
+        <DialogTitle>Add New Product to {{ activeStall?.name }}</DialogTitle>
       </DialogHeader>
       
-      <div class="space-y-6 py-4">
-        <div class="text-center py-8">
-          <Package class="w-16 h-16 mx-auto mb-4 text-muted-foreground" />
-          <h3 class="text-lg font-medium text-foreground mb-2">Product Creation Coming Soon</h3>
-          <p class="text-muted-foreground">
-            We're working on the product creation form. This will allow you to add products with images, descriptions, pricing, and inventory management.
-          </p>
+      <form @submit="onProductSubmit" class="space-y-6 py-4" autocomplete="off">
+        <!-- Basic Product Info -->
+        <div class="grid grid-cols-1 md:grid-cols-2 gap-6">
+          <!-- Product Name -->
+          <FormField v-slot="{ componentField }" name="name">
+            <FormItem>
+              <FormLabel>Product Name *</FormLabel>
+              <FormControl>
+                <Input 
+                  placeholder="Enter product name"
+                  :disabled="isCreatingProduct"
+                  v-bind="componentField"
+                />
+              </FormControl>
+              <FormDescription>Choose a clear, descriptive name</FormDescription>
+              <FormMessage />
+            </FormItem>
+          </FormField>
+
+          <!-- Price -->
+          <FormField v-slot="{ componentField }" name="price">
+            <FormItem>
+              <FormLabel>Price * ({{ activeStall?.currency || 'sat' }})</FormLabel>
+              <FormControl>
+                <Input 
+                  type="number"
+                  step="0.01"
+                  min="0.01"
+                  placeholder="0.00"
+                  :disabled="isCreatingProduct"
+                  v-bind="componentField"
+                />
+              </FormControl>
+              <FormDescription>Price in {{ activeStall?.currency || 'sat' }}</FormDescription>
+              <FormMessage />
+            </FormItem>
+          </FormField>
         </div>
-        
+
+        <!-- Description -->
+        <FormField v-slot="{ componentField }" name="description">
+          <FormItem>
+            <FormLabel>Description</FormLabel>
+            <FormControl>
+              <Textarea
+                placeholder="Describe your product, its features, and benefits"
+                :disabled="isCreatingProduct"
+                v-bind="componentField"
+                rows="4"
+              />
+            </FormControl>
+            <FormDescription>Detailed description to help customers understand your product</FormDescription>
+            <FormMessage />
+          </FormItem>
+        </FormField>
+
+        <!-- Quantity and Active Status -->
+        <div class="grid grid-cols-1 md:grid-cols-2 gap-6">
+          <!-- Quantity -->
+          <FormField v-slot="{ componentField }" name="quantity">
+            <FormItem>
+              <FormLabel>Quantity *</FormLabel>
+              <FormControl>
+                <Input 
+                  type="number"
+                  min="0"
+                  placeholder="1"
+                  :disabled="isCreatingProduct"
+                  v-bind="componentField"
+                />
+              </FormControl>
+              <FormDescription>Available quantity (0 = unlimited)</FormDescription>
+              <FormMessage />
+            </FormItem>
+          </FormField>
+
+          <!-- Active Status -->
+          <FormField v-slot="{ value, handleChange }" name="active">
+            <FormItem>
+              <div class="space-y-3">
+                <FormLabel>Product Status</FormLabel>
+                <FormControl>
+                  <div class="flex items-center space-x-2">
+                    <Checkbox
+                      :checked="value"
+                      @update:checked="handleChange"
+                      :disabled="isCreatingProduct"
+                    />
+                    <Label>Product is active and visible</Label>
+                  </div>
+                </FormControl>
+                <FormDescription>Inactive products won't be shown to customers</FormDescription>
+                <FormMessage />
+              </div>
+            </FormItem>
+          </FormField>
+        </div>
+
+        <!-- Categories -->
+        <FormField name="categories">
+          <FormItem>
+            <FormLabel>Categories</FormLabel>
+            <FormDescription>Add categories to help customers find your product</FormDescription>
+            <div class="text-center py-8 border-2 border-dashed rounded-lg">
+              <Package class="w-8 h-8 mx-auto mb-2 text-muted-foreground" />
+              <p class="text-sm text-muted-foreground">Category management coming soon</p>
+            </div>
+            <FormMessage />
+          </FormItem>
+        </FormField>
+
+        <!-- Images -->
+        <FormField name="images">
+          <FormItem>
+            <FormLabel>Product Images</FormLabel>
+            <FormDescription>Add images to showcase your product</FormDescription>
+            <div class="text-center py-8 border-2 border-dashed rounded-lg">
+              <Package class="w-8 h-8 mx-auto mb-2 text-muted-foreground" />
+              <p class="text-sm text-muted-foreground">Image upload coming soon</p>
+            </div>
+            <FormMessage />
+          </FormItem>
+        </FormField>
+
+        <!-- Auto-reply Settings -->
+        <div class="border-t pt-6">
+          <FormField v-slot="{ value, handleChange }" name="use_autoreply">
+            <FormItem>
+              <div class="flex items-center space-x-2">
+                <FormControl>
+                  <Checkbox
+                    :checked="value"
+                    @update:checked="handleChange"
+                    :disabled="isCreatingProduct"
+                  />
+                </FormControl>
+                <FormLabel>Enable auto-reply to customer messages</FormLabel>
+              </div>
+              <FormDescription>Automatically respond to customer inquiries about this product</FormDescription>
+              <FormMessage />
+            </FormItem>
+          </FormField>
+
+          <FormField v-slot="{ componentField }" name="autoreply_message">
+            <FormItem class="mt-4">
+              <FormLabel>Auto-reply Message</FormLabel>
+              <FormControl>
+                <Textarea
+                  placeholder="Thank you for your interest! I'll get back to you soon..."
+                  :disabled="isCreatingProduct"
+                  v-bind="componentField"
+                  rows="3"
+                />
+              </FormControl>
+              <FormDescription>Message sent automatically when customers inquire about this product</FormDescription>
+              <FormMessage />
+            </FormItem>
+          </FormField>
+        </div>
+
+        <!-- Error Display -->
+        <div v-if="productCreateError" class="text-sm text-destructive">
+          {{ productCreateError }}
+        </div>
+
         <div class="flex justify-end space-x-2 pt-4">
           <Button 
             type="button"
             @click="showProductDialog = false" 
             variant="outline"
+            :disabled="isCreatingProduct"
           >
-            Close
+            Cancel
+          </Button>
+          <Button 
+            type="submit"
+            :disabled="isCreatingProduct || !isProductFormValid"
+          >
+            <span v-if="isCreatingProduct">Creating...</span>
+            <span v-else>Create Product</span>
           </Button>
         </div>
-      </div>
+      </form>
     </DialogContent>
   </Dialog>
 </template>
@@ -894,7 +1058,20 @@ const stallFormSchema = toTypedSchema(z.object({
   }).optional()
 }))
 
-// Form setup with vee-validate
+// Product form schema
+const productFormSchema = toTypedSchema(z.object({
+  name: z.string().min(1, "Product name is required").max(100, "Product name must be less than 100 characters"),
+  description: z.string().max(1000, "Description must be less than 1000 characters"),
+  price: z.number().min(0.01, "Price must be greater than 0"),
+  quantity: z.number().int().min(0, "Quantity must be 0 or greater"),
+  categories: z.array(z.string()).max(10, "Maximum 10 categories allowed"),
+  images: z.array(z.string().url("Invalid image URL")).max(5, "Maximum 5 images allowed"),
+  active: z.boolean(),
+  use_autoreply: z.boolean(),
+  autoreply_message: z.string().max(500, "Auto-reply message must be less than 500 characters")
+}))
+
+// Stall form setup with vee-validate
 const form = useForm({
   validationSchema: stallFormSchema,
   initialValues: {
@@ -911,24 +1088,59 @@ const form = useForm({
   }
 })
 
-// Destructure form methods for easier access
+// Product form setup with vee-validate
+const productForm = useForm({
+  validationSchema: productFormSchema,
+  initialValues: {
+    name: '',
+    description: '',
+    price: 0,
+    quantity: 1,
+    categories: [] as string[],
+    images: [] as string[],
+    active: true,
+    use_autoreply: false,
+    autoreply_message: ''
+  }
+})
+
+// Destructure stall form methods for easier access
 const { setFieldValue, resetForm, values, meta, validate } = form
 
+// Destructure product form methods for easier access
+const { 
+  setFieldValue: setProductFieldValue, 
+  resetForm: resetProductForm, 
+  values: productValues, 
+  meta: productMeta, 
+  validate: validateProduct 
+} = productForm
+
 // Helper function to get field values safely
 const getFieldValue = (fieldName: string) => {
   return fieldName.split('.').reduce((obj, key) => obj?.[key], values)
 }
 
-// Form validation computed with detailed debugging
+// Stall form validation computed
 const isFormValid = computed(() => {
   return meta.value.valid
 })
 
-// Form submit handler
+// Product form validation computed
+const isProductFormValid = computed(() => {
+  return productMeta.value.valid
+})
+
+// Stall form submit handler
 const onSubmit = form.handleSubmit(async (values) => {
   await createStall(values)
 })
 
+// Product form submit handler
+const onProductSubmit = productForm.handleSubmit(async (values) => {
+  await createProduct(values)
+})
+
 // Computed properties
 const userHasMerchantProfile = computed(() => {
   // Use the actual API response to determine if user has merchant profile
@@ -1550,9 +1762,74 @@ const loadStallProducts = async () => {
 
 const addProduct = () => {
   if (!activeStall.value) return
+  // Reset product form to initial state
+  resetProductForm()
   showProductDialog.value = true
 }
 
+const createProduct = async (formData: any) => {
+  const currentUser = auth.currentUser?.value
+  if (!currentUser?.wallets?.length || !activeStall.value) {
+    toast.error('No active store or wallets available')
+    return
+  }
+
+  const { 
+    name, 
+    description, 
+    price, 
+    quantity, 
+    categories, 
+    images, 
+    active, 
+    use_autoreply, 
+    autoreply_message 
+  } = formData
+
+  isCreatingProduct.value = true
+  productCreateError.value = null
+
+  try {
+    const productData: CreateProductRequest = {
+      stall_id: activeStall.value.id,
+      name,
+      categories: categories || [],
+      images: images || [],
+      price: Number(price),
+      quantity: Number(quantity),
+      active,
+      config: {
+        description: description || '',
+        currency: activeStall.value.currency,
+        use_autoreply,
+        autoreply_message: use_autoreply ? autoreply_message || '' : '',
+        shipping: [] // Will be populated from shipping zones if needed
+      }
+    }
+
+    const newProduct = await nostrmarketAPI.createProduct(
+      currentUser.wallets[0].adminkey,
+      productData
+    )
+
+    // Refresh the products list
+    await loadStallProducts()
+    
+    // Reset form and close dialog
+    resetProductForm()
+    showProductDialog.value = false
+    
+    toast.success(`Product "${name}" created successfully!`)
+  } catch (error) {
+    const errorMessage = error instanceof Error ? error.message : 'Failed to create product'
+    console.error('Error creating product:', error)
+    productCreateError.value = errorMessage
+    toast.error(`Failed to create product: ${errorMessage}`)
+  } finally {
+    isCreatingProduct.value = false
+  }
+}
+
 // Lifecycle
 onMounted(async () => {
   console.log('Merchant Store component loaded')