diff --git a/public/viewjs/consume.js b/public/viewjs/consume.js
index 82a7a0d9..e9155605 100644
--- a/public/viewjs/consume.js
+++ b/public/viewjs/consume.js
@@ -97,6 +97,7 @@
 						$("#display_amount").attr("step", "1");
 						$("#display_amount").parent().find(".invalid-feedback").text(__t('The amount cannot be lower than %s', '1'));
 						$('#display_amount').val(parseFloat(Grocy.UserSettings.stock_default_consume_amount).toLocaleString({ minimumFractionDigits: 0, maximumFractionDigits: Grocy.UserSettings.stock_decimal_places_amounts }));
+						$(".input-group-productamountpicker").trigger("change");
 						$("#tare-weight-handling-info").addClass("d-none");
 						Grocy.Components.ProductPicker.Clear();
 						if (Grocy.FeatureFlags.GROCY_FEATURE_FLAG_RECIPES)
@@ -161,6 +162,7 @@ $('#save-mark-as-open-button').on('click', function(e)
 					toastr.success(__t('Marked %1$s of %2$s as opened', jsonForm.amount + " " + __n(jsonForm.amount, productDetails.quantity_unit_stock.name, productDetails.quantity_unit_stock.name_plural), productDetails.product.name) + '<br><a class="btn btn-secondary btn-sm mt-2" href="#" onclick="UndoStockTransaction(\'' + result.transaction_id + '\')"><i class="fas fa-undo"></i> ' + __t("Undo") + '</a>');
 
 					$('#display_amount').val(parseFloat(Grocy.UserSettings.stock_default_consume_amount).toLocaleString({ minimumFractionDigits: 0, maximumFractionDigits: Grocy.UserSettings.stock_decimal_places_amounts }));
+					$(".input-group-productamountpicker").trigger("change");
 					Grocy.Components.ProductPicker.Clear();
 					Grocy.Components.ProductPicker.GetInputElement().focus();
 					Grocy.FrontendHelpers.ValidateForm('consume-form');
@@ -273,6 +275,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 }));
+				$(".input-group-productamountpicker").trigger("change");
 
 				$("#location_id").find("option").remove().end().append("<option></option>");
 				Grocy.Api.Get("stock/products/" + productId + '/locations',
@@ -309,6 +312,8 @@ Grocy.Components.ProductPicker.GetPicker().on('change', function(e)
 						if (BoolVal(Grocy.UserSettings.scan_mode_consume_enabled))
 						{
 							$("#display_amount").val(1);
+							$(".input-group-productamountpicker").trigger("change");
+
 							Grocy.FrontendHelpers.ValidateForm("consume-form");
 							if (document.getElementById("consume-form").checkValidity() === true)
 							{
@@ -385,6 +390,7 @@ Grocy.Components.ProductPicker.GetPicker().on('change', function(e)
 });
 
 $('#display_amount').val(parseFloat(Grocy.UserSettings.stock_default_consume_amount).toLocaleString({ minimumFractionDigits: 0, maximumFractionDigits: Grocy.UserSettings.stock_decimal_places_amounts }));
+$(".input-group-productamountpicker").trigger("change");
 Grocy.FrontendHelpers.ValidateForm('consume-form');
 
 $('#display_amount').on('focus', function(e)
diff --git a/public/viewjs/inventory.js b/public/viewjs/inventory.js
index ca1b3774..a7c5ae87 100644
--- a/public/viewjs/inventory.js
+++ b/public/viewjs/inventory.js
@@ -86,6 +86,7 @@
 								$("#display_amount").attr("step", "1");
 								$("#display_amount").parent().find(".invalid-feedback").text(__t('The amount cannot be lower than %s', '0'));
 								$('#display_amount').val('');
+								$(".input-group-productamountpicker").trigger("change");
 								$('#price').val('');
 								Grocy.Components.DateTimePicker.Clear();
 								Grocy.Components.ProductPicker.SetValue('');
@@ -172,6 +173,7 @@ Grocy.Components.ProductPicker.GetPicker().on('change', function(e)
 				}
 
 				$('#display_amount').val(productDetails.stock_amount);
+				$(".input-group-productamountpicker").trigger("change");
 				$('#display_amount').focus();
 				$('#display_amount').trigger('keyup');
 			},
@@ -184,6 +186,7 @@ Grocy.Components.ProductPicker.GetPicker().on('change', function(e)
 });
 
 $('#display_amount').val('');
+$(".input-group-productamountpicker").trigger("change");
 Grocy.FrontendHelpers.ValidateForm('inventory-form');
 
 if (Grocy.Components.ProductPicker.InProductAddWorkflow() === false)
diff --git a/public/viewjs/mealplan.js b/public/viewjs/mealplan.js
index c9265a6c..36525fff 100644
--- a/public/viewjs/mealplan.js
+++ b/public/viewjs/mealplan.js
@@ -777,6 +777,7 @@ Grocy.Components.ProductPicker.GetPicker().on('change', function(e)
 				Grocy.Components.ProductAmountPicker.Reload(productDetails.product.id, productDetails.quantity_unit_stock.id);
 
 				$('#display_amount').val(1);
+				$(".input-group-productamountpicker").trigger("change");
 				$('#display_amount').focus();
 				$('#display_amount').select();
 				$(".input-group-productamountpicker").trigger("change");
diff --git a/public/viewjs/productbarcodeform.js b/public/viewjs/productbarcodeform.js
index cdb19a6e..917df311 100644
--- a/public/viewjs/productbarcodeform.js
+++ b/public/viewjs/productbarcodeform.js
@@ -75,6 +75,7 @@ Grocy.Components.ProductAmountPicker.Reload(Grocy.EditObjectProduct.id, Grocy.Ed
 if (Grocy.EditMode == "edit")
 {
 	$("#display_amount").val(Grocy.EditObject.amount);
+	$(".input-group-productamountpicker").trigger("change");
 	Grocy.Components.ProductAmountPicker.SetQuantityUnit(Grocy.EditObject.qu_id);
 }
 
diff --git a/public/viewjs/purchase.js b/public/viewjs/purchase.js
index bb92a628..b362b72a 100644
--- a/public/viewjs/purchase.js
+++ b/public/viewjs/purchase.js
@@ -102,6 +102,7 @@
 						$("#display_amount").attr("step", "1");
 						$("#display_amount").parent().find(".invalid-feedback").text(__t('The amount cannot be lower than %s', '1'));
 						$('#display_amount').val(parseFloat(Grocy.UserSettings.stock_default_purchase_amount).toLocaleString({ minimumFractionDigits: 0, maximumFractionDigits: Grocy.UserSettings.stock_decimal_places_amounts }));
+						$(".input-group-productamountpicker").trigger("change");
 						$('#price').val('');
 						$("#tare-weight-handling-info").addClass("d-none");
 						if (Grocy.FeatureFlags.GROCY_FEATURE_FLAG_STOCK_LOCATION_TRACKING)
@@ -164,12 +165,15 @@ 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 }));
+					$(".input-group-productamountpicker").trigger("change");
 
 					if (GetUriParam("flow") === "shoppinglistitemtostock")
 					{
 						$('#display_amount').val(parseFloat(GetUriParam("amount")).toLocaleString({ minimumFractionDigits: 0, maximumFractionDigits: Grocy.UserSettings.stock_decimal_places_amounts }));
 					}
 
+					$(".input-group-productamountpicker").trigger("change");
+
 					if (Grocy.FeatureFlags.GROCY_FEATURE_FLAG_STOCK_PRICE_TRACKING)
 					{
 						if (productDetails.last_shopping_location_id != null)
@@ -250,6 +254,8 @@ if (Grocy.Components.ProductPicker !== undefined)
 					if (BoolVal(Grocy.UserSettings.scan_mode_purchase_enabled))
 					{
 						$("#display_amount").val(1);
+						$(".input-group-productamountpicker").trigger("change");
+
 						Grocy.FrontendHelpers.ValidateForm("purchase-form");
 						if (document.getElementById("purchase-form").checkValidity() === true)
 						{
@@ -276,6 +282,7 @@ if (Grocy.Components.ProductPicker !== undefined)
 										if (barcode.amount != null)
 										{
 											$("#display_amount").val(barcode.amount);
+											$(".input-group-productamountpicker").trigger("change");
 											$("#display_amount").select();
 										}
 
@@ -312,6 +319,7 @@ if (Grocy.Components.ProductPicker !== undefined)
 }
 
 $('#display_amount').val(parseFloat(Grocy.UserSettings.stock_default_purchase_amount).toLocaleString({ minimumFractionDigits: 0, maximumFractionDigits: Grocy.UserSettings.stock_decimal_places_amounts }));
+$(".input-group-productamountpicker").trigger("change");
 Grocy.FrontendHelpers.ValidateForm('purchase-form');
 
 if (Grocy.Components.ProductPicker)
diff --git a/public/viewjs/shoppinglistitemform.js b/public/viewjs/shoppinglistitemform.js
index ee4099e2..2ebceeb1 100644
--- a/public/viewjs/shoppinglistitemform.js
+++ b/public/viewjs/shoppinglistitemform.js
@@ -178,6 +178,7 @@ if (GetUriParam("list") !== undefined)
 if (GetUriParam("amount") !== undefined)
 {
 	$("#display_amount").val(parseFloat(GetUriParam("amount")).toLocaleString({ minimumFractionDigits: 0, maximumFractionDigits: Grocy.UserSettings.stock_decimal_places_amounts }));
+	$(".input-group-productamountpicker").trigger("change");
 	Grocy.FrontendHelpers.ValidateForm('shoppinglist-form');
 }
 
diff --git a/public/viewjs/transfer.js b/public/viewjs/transfer.js
index 30821ebc..7b78f1b4 100644
--- a/public/viewjs/transfer.js
+++ b/public/viewjs/transfer.js
@@ -94,6 +94,7 @@
 						$("#display_amount").attr("step", "1");
 						$("#display_amount").parent().find(".invalid-feedback").text(__t('The amount cannot be lower than %s', '1'));
 						$('#display_amount').val(parseFloat(Grocy.UserSettings.stock_default_transfer_amount).toLocaleString({ minimumFractionDigits: 0, maximumFractionDigits: Grocy.UserSettings.stock_decimal_places_amounts }));
+						$(".input-group-productamountpicker").trigger("change");
 						$("#tare-weight-handling-info").addClass("d-none");
 						Grocy.Components.ProductPicker.Clear();
 						$("#location_id_to").val("");
@@ -233,6 +234,7 @@ Grocy.Components.ProductPicker.GetPicker().on('change', function(e)
 });
 
 $('#display_amount').val(parseFloat(Grocy.UserSettings.stock_default_transfer_amount).toLocaleString({ minimumFractionDigits: 0, maximumFractionDigits: 4 }));
+$(".input-group-productamountpicker").trigger("change");
 Grocy.FrontendHelpers.ValidateForm('transfer-form');
 
 $("#location_id_from").on('change', function(e)