diff --git a/public/viewjs/consume.js b/public/viewjs/consume.js
index 159d0d78..82a7a0d9 100644
--- a/public/viewjs/consume.js
+++ b/public/viewjs/consume.js
@@ -272,6 +272,7 @@ Grocy.Components.ProductPicker.GetPicker().on('change', function(e)
 			{
 				Grocy.Components.ProductAmountPicker.Reload(productDetails.product.id, productDetails.quantity_unit_stock.id);
 				Grocy.Components.ProductAmountPicker.SetQuantityUnit(productDetails.quantity_unit_stock.id);
+				$('#display_amount').val(parseFloat(Grocy.UserSettings.stock_default_consume_amount).toLocaleString({ minimumFractionDigits: 0, maximumFractionDigits: Grocy.UserSettings.stock_decimal_places_amounts }));
 
 				$("#location_id").find("option").remove().end().append("<option></option>");
 				Grocy.Api.Get("stock/products/" + productId + '/locations',
diff --git a/public/viewjs/purchase.js b/public/viewjs/purchase.js
index 07696740..66899934 100644
--- a/public/viewjs/purchase.js
+++ b/public/viewjs/purchase.js
@@ -163,6 +163,7 @@ if (Grocy.Components.ProductPicker !== undefined)
 				{
 					Grocy.Components.ProductAmountPicker.Reload(productDetails.product.id, productDetails.quantity_unit_stock.id);
 					Grocy.Components.ProductAmountPicker.SetQuantityUnit(productDetails.quantity_unit_purchase.id);
+					$('#display_amount').val(parseFloat(Grocy.UserSettings.stock_default_purchase_amount).toLocaleString({ minimumFractionDigits: 0, maximumFractionDigits: Grocy.UserSettings.stock_decimal_places_amounts }));
 
 					var barcode_shopping_location_id = null;
 
@@ -270,6 +271,7 @@ if (Grocy.Components.ProductPicker !== undefined)
 									if (barcode.amount != null)
 									{
 										$("#display_amount").val(barcode.amount);
+										$("#display_amount").select();
 									}
 
 									if (barcode.qu_id != null)