diff --git a/public/viewjs/purchase.js b/public/viewjs/purchase.js
index a033f9c3..e3835da9 100644
--- a/public/viewjs/purchase.js
+++ b/public/viewjs/purchase.js
@@ -178,7 +178,6 @@ $('#save-purchase-button').on('click', function(e)
 							window.parent.postMessage(WindowMessageBag("AfterItemAdded", GetUriParam("listitemid")), Grocy.BaseUrl);
 							window.parent.postMessage(WindowMessageBag("ShowSuccessMessage", successMessage), Grocy.BaseUrl);
 							window.parent.postMessage(WindowMessageBag("Ready"), Grocy.BaseUrl);
-							window.parent.postMessage(WindowMessageBag("CloseLastModal"), Grocy.BaseUrl);
 						});
 					}
 					else
diff --git a/public/viewjs/stockentries.js b/public/viewjs/stockentries.js
index 3f1d21d0..bd513f56 100644
--- a/public/viewjs/stockentries.js
+++ b/public/viewjs/stockentries.js
@@ -322,6 +322,9 @@ $(window).on("message", function(e)
 		{
 			RefreshStockEntryRow($(this).attr("data-stockrow-id"));
 		});
+	} else if (data.Message == "Ready")
+	{
+		window.parent.postMessage(WindowMessageBag("CloseLastModal"), Grocy.BaseUrl);
 	};
 });
 
diff --git a/public/viewjs/stockoverview.js b/public/viewjs/stockoverview.js
index 9e03e12a..3d802872 100755
--- a/public/viewjs/stockoverview.js
+++ b/public/viewjs/stockoverview.js
@@ -416,5 +416,8 @@ $(window).on("message", function(e)
 	{
 		RefreshProductRow(data.Payload);
 		RefreshStatistics();
-	}
+	} else if (data.Message == "Ready")
+	{
+		window.parent.postMessage(WindowMessageBag("CloseLastModal"), Grocy.BaseUrl);
+	};
 });