diff --git a/changelog/81_UNRELEASED_xxxx-xx-xx.md b/changelog/81_UNRELEASED_xxxx-xx-xx.md
index 01bc3bcb..fd3d86bd 100644
--- a/changelog/81_UNRELEASED_xxxx-xx-xx.md
+++ b/changelog/81_UNRELEASED_xxxx-xx-xx.md
@@ -10,7 +10,7 @@
 
 ### Stock
 
-- xxx
+- Fixed that when using/scanning a barcode on the purchase page with a note attached (which prefills the note field) and when manually selecting another product afterwards, the note of the previously used barcode was incorrectly prefilled again
 
 ### Shopping list
 
diff --git a/public/viewjs/components/productpicker.js b/public/viewjs/components/productpicker.js
index 85dd00c5..0141fed1 100644
--- a/public/viewjs/components/productpicker.js
+++ b/public/viewjs/components/productpicker.js
@@ -32,6 +32,7 @@ Grocy.Components.ProductPicker.Clear = function()
 {
 	Grocy.Components.ProductPicker.SetValue('');
 	Grocy.Components.ProductPicker.SetId(null);
+	$('#product_id').attr("barcode", "null");
 }
 
 Grocy.Components.ProductPicker.InProductAddWorkflow = function()
diff --git a/public/viewjs/inventory.js b/public/viewjs/inventory.js
index c74d1568..1c03a08c 100644
--- a/public/viewjs/inventory.js
+++ b/public/viewjs/inventory.js
@@ -155,7 +155,7 @@ $('#save-inventory-button').on('click', function(e)
 									$('#note').val('');
 									$('#price-hint').text("");
 									Grocy.Components.DateTimePicker.Clear();
-									Grocy.Components.ProductPicker.SetValue('');
+									Grocy.Components.ProductPicker.Clear();
 									if (Grocy.FeatureFlags.GROCY_FEATURE_FLAG_STOCK_PRICE_TRACKING)
 									{
 										Grocy.Components.ShoppingLocationPicker.SetValue('');
diff --git a/public/viewjs/purchase.js b/public/viewjs/purchase.js
index dfe33b27..4d13aa89 100644
--- a/public/viewjs/purchase.js
+++ b/public/viewjs/purchase.js
@@ -202,6 +202,7 @@ $('#save-purchase-button').on('click', function(e)
 							}
 
 							Grocy.Components.ProductAmountPicker.Reset();
+							Grocy.Components.ProductPicker.Clear();
 							$("#purchase-form").removeAttr("data-used-barcode");
 							$("#display_amount").attr("min", Grocy.DefaultMinAmount);
 							$('#display_amount').val(Grocy.UserSettings.stock_default_purchase_amount);
@@ -216,7 +217,6 @@ $('#save-purchase-button').on('click', function(e)
 							{
 								Grocy.Components.DateTimePicker.Clear();
 							}
-							Grocy.Components.ProductPicker.SetValue('');
 							if (Grocy.FeatureFlags.GROCY_FEATURE_FLAG_STOCK_PRICE_TRACKING)
 							{
 								Grocy.Components.ShoppingLocationPicker.SetValue('');