diff --git a/public/viewjs/components/productpicker.js b/public/viewjs/components/productpicker.js
index 97899450..2323c1e9 100644
--- a/public/viewjs/components/productpicker.js
+++ b/public/viewjs/components/productpicker.js
@@ -75,6 +75,11 @@ if (typeof prefillProduct !== "undefined")
 }
 
 var prefillProductId = GetUriParam("product");
+var prefillProductId2 = Grocy.Components.ProductPicker.GetPicker().parent().data('prefill-by-id').toString();
+if (!prefillProductId2.isEmpty())
+{
+	prefillProductId = prefillProductId2;
+}
 if (typeof prefillProductId !== "undefined")
 {
 	$('#product_id').val(prefillProductId);
diff --git a/public/viewjs/shoppinglistform.js b/public/viewjs/shoppinglistform.js
index b4076d02..ead9c1ec 100644
--- a/public/viewjs/shoppinglistform.js
+++ b/public/viewjs/shoppinglistform.js
@@ -59,14 +59,11 @@ Grocy.Components.ProductPicker.GetPicker().on('change', function(e)
 });
 
 Grocy.FrontendHelpers.ValidateForm('shoppinglist-form');
+Grocy.Components.ProductPicker.GetInputElement().focus();
 
-if (Grocy.Components.ProductPicker.InProductAddWorkflow() === false)
+if (Grocy.EditMode === "edit")
 {
-	Grocy.Components.ProductPicker.GetInputElement().focus();
-}
-else
-{
-	Grocy.Components.ProductPicker.GetPicker().trigger('change');
+	Grocy.Components.ProductPicker.GetPicker().trigger('change');	
 }
 
 $('#amount').on('focus', function(e)
diff --git a/views/components/productpicker.blade.php b/views/components/productpicker.blade.php
index fbc250e1..cc766b6b 100644
--- a/views/components/productpicker.blade.php
+++ b/views/components/productpicker.blade.php
@@ -4,9 +4,10 @@
 
 @php if(empty($disallowAddProductWorkflows)) { $disallowAddProductWorkflows = false; } @endphp
 @php if(empty($prefillByName)) { $prefillByName = ''; } @endphp
+@php if(empty($prefillById)) { $prefillById = ''; } @endphp
 @php if(!isset($isRequired)) { $isRequired = true; } @endphp
 
-<div class="form-group" data-next-input-selector="{{ $nextInputSelector }}" data-disallow-add-product-workflows="{{ BoolToString($disallowAddProductWorkflows) }}" data-prefill-by-name="{{ $prefillByName }}">
+<div class="form-group" data-next-input-selector="{{ $nextInputSelector }}" data-disallow-add-product-workflows="{{ BoolToString($disallowAddProductWorkflows) }}" data-prefill-by-name="{{ $prefillByName }}" data-prefill-by-id="{{ $prefillById }}">
 	<label for="product_id">{{ $L('Product') }} <i class="fas fa-barcode"></i><span id="barcode-lookup-disabled-hint" class="small text-muted d-none"> {{ $L('Barcode lookup is disabled') }}</span></label>
 	<select class="form-control product-combobox" id="product_id" name="product_id" @if($isRequired) required @endif>
 		<option value=""></option>
diff --git a/views/shoppinglistform.blade.php b/views/shoppinglistform.blade.php
index 494e138b..0feb96de 100644
--- a/views/shoppinglistform.blade.php
+++ b/views/shoppinglistform.blade.php
@@ -21,10 +21,12 @@
 
 		<form id="shoppinglist-form" novalidate>
 
+			@php if($mode == 'edit') { $productId = $listItem->product_id; } else { $productId = ''; } @endphp
 			@include('components.productpicker', array(
 				'products' => $products,
 				'nextInputSelector' => '#amount',
-				'isRequired' => false
+				'isRequired' => false,
+				'prefillById' => $productId
 			))
 
 			@php if($mode == 'edit') { $value = $listItem->amount; } else { $value = 1; } @endphp