diff --git a/public/viewjs/recipeform.js b/public/viewjs/recipeform.js
index 2e2948b9..db99f01e 100644
--- a/public/viewjs/recipeform.js
+++ b/public/viewjs/recipeform.js
@@ -368,3 +368,9 @@ Grocy.Components.RecipePicker.GetPicker().on('change', function (e)
 		}
 	);
 });
+
+Grocy.Components.ProductPicker.GetPicker().on('change', function(e)
+{
+	// Just save the current recipe on every change of the product picker as a workflow could be started which leaves the page...
+	Grocy.Api.Put('objects/recipes/' + Grocy.EditObjectId, $('#recipe-form').serializeJSON(), function () { }, function () { });
+});
diff --git a/services/StockService.php b/services/StockService.php
index be55daeb..7d99a8f7 100644
--- a/services/StockService.php
+++ b/services/StockService.php
@@ -591,11 +591,14 @@ class StockService extends BaseService
 		));
 		$logOldRowForStockUpdate->save();
 
-		$openDate = $stockRow->opened_date;
-		if ($open && $openDate == null) {
-			$openDate = date('Y-m-d');
-		} else if (!$open) {
-			$openDate = null;
+		$openedDate = $stockRow->opened_date;
+		if ($open && $openDate == null)
+		{
+			$openedDate = date('Y-m-d');
+		}
+		else if (!$open)
+		{
+			$openedDate = null;
 		}
 
 		$stockRow->update(array(
@@ -603,7 +606,7 @@ class StockService extends BaseService
 			'price' => $price,
 			'best_before_date' => $bestBeforeDate,
 			'location_id' => $locationId,
-			'opened_date' => $openDate,
+			'opened_date' => $openedDate,
 			'open' => $open
 		));