diff --git a/public/viewjs/shoppinglistitemform.js b/public/viewjs/shoppinglistitemform.js
index 09dca053..46b86a77 100644
--- a/public/viewjs/shoppinglistitemform.js
+++ b/public/viewjs/shoppinglistitemform.js
@@ -275,7 +275,7 @@ if (GetUriParam("amount") !== undefined)
 
 if (GetUriParam("embedded") !== undefined)
 {
-	if (GetUriParam("product") !== undefined)
+	if (GetUriParam("product") !== undefined || Grocy.EditMode == "edit")
 	{
 		Grocy.Components.ProductPicker.GetPicker().trigger('change');
 		$("#display_amount").focus();