diff --git a/app/Filament/Resources/InvoiceValidationResource/Pages/CreateInvoiceValidation.php b/app/Filament/Resources/InvoiceValidationResource/Pages/CreateInvoiceValidation.php
index 206c9a7..8959b59 100644
--- a/app/Filament/Resources/InvoiceValidationResource/Pages/CreateInvoiceValidation.php
+++ b/app/Filament/Resources/InvoiceValidationResource/Pages/CreateInvoiceValidation.php
@@ -3958,7 +3958,7 @@ class CreateInvoiceValidation extends CreateRecord
 
                         //hereToUpdate
                         //$this->dispatch('openCapacitorModal');
-                        $this->dispatch( 'refreshInvoiceData', invoiceNumber: $invoiceNumber, plantId: $plantId);
+                        $this->dispatch('openCapacitorModal', itemCode: $itemCode, serialNumber: $serialNumber, plantId: $plantId);
 
                         $scannedQuantity = InvoiceValidation::where('invoice_number', $invoiceNumber)->where('scanned_status', 'Scanned')->where('plant_id', $plantId)->count();
 
@@ -3971,7 +3971,8 @@ class CreateInvoiceValidation extends CreateRecord
                             'scanned_quantity'=> $scannedQuantity,
                         ]);
 
-                        $this->dispatch('openCapacitorModal', itemCode: $itemCode, serialNumber: $serialNumber, plantId: $plantId);
+                        $this->dispatch( 'refreshInvoiceData', invoiceNumber: $invoiceNumber, plantId: $plantId);
+                        $this->dispatch('focus-capacitor-input');
                         // $this->refreshInvoiceTable();
                         return;