diff --git a/OrdersManagement/Components/Pages/WarehousePackList.razor b/OrdersManagement/Components/Pages/WarehousePackList.razor
index 1bbf3a8..52ed7d8 100644
--- a/OrdersManagement/Components/Pages/WarehousePackList.razor
+++ b/OrdersManagement/Components/Pages/WarehousePackList.razor
@@ -307,9 +307,12 @@
     }
 
     private void FillMeylePartNumber(string scannedValue)
-    {
+    {   
         if (SelectedRow != null)
         {
+            var rowIndex = WzRowsMeyle.FindIndex(x => x.FaIndex == SelectedRow?.ItemNumber && x.Quantity == SelectedRow?.Quantity);
+            FocusGridRow(rowIndex);
+            
             SelectedRow.PartNumber = scannedValue;
             ChangedRecords.Add(SelectedRow);
         }
@@ -358,6 +361,8 @@
             }
             default:
             {
+                FocusGridRow(rowIndex);
+                
                 SelectedRow = WzRowsMeyle[rowIndex];
 
                 SelectedRow.PartNumberSl = ScannedValue;
@@ -367,8 +372,7 @@
                 {
                     ChangedRecords.Add(SelectedRow);
                 }
-
-                FocusGridRow(rowIndex);
+                
                 break;
             }
         }