diff --git a/public/js/grocy.js b/public/js/grocy.js
index d2a12bdd..c9cba036 100644
--- a/public/js/grocy.js
+++ b/public/js/grocy.js
@@ -542,37 +542,21 @@ if ($(".custom-file-label").length > 0)
 	$("<style>").html('.custom-file-label::after { content: "' + __t("Select file") + '"; }').appendTo("head");
 }
 
-ResizeResponsiveEmbeds = function(fillEntireViewport = false, iframesOnly = false)
+ResizeResponsiveEmbeds = function(fillEntireViewport = false)
 {
-	if (!iframesOnly)
+	if (!fillEntireViewport)
 	{
-		if (!fillEntireViewport)
-		{
-			var maxHeight = $("body").height() - $("#mainNav").outerHeight() - 62;
-		}
-		else
-		{
-			var maxHeight = $("body").height();
-		}
-		$("embed.embed-responsive").attr("height", maxHeight.toString() + "px");
+		var maxHeight = $("body").height() - $("#mainNav").outerHeight() - 62;
 	}
+	else
+	{
+		var maxHeight = $("body").height();
+	}
+	$("embed.embed-responsive").attr("height", maxHeight.toString() + "px");
 
 	$("iframe.embed-responsive").each(function()
 	{
-		var iframeHeight = $(this)[0].contentWindow.document.body.scrollHeight;
-
-		if (iframeHeight == 0)
-		{
-			// Iframe has most likely not finished loading yet => try again later
-			setTimeout(function()
-			{
-				ResizeResponsiveEmbeds(fillEntireViewport, true);
-			}, 150);
-		}
-		else
-		{
-			$(this).attr("height", iframeHeight.toString() + "px");
-		}
+		$(this).attr("height", $(this)[0].contentWindow.document.body.scrollHeight.toString() + "px");
 	});
 }
 $(window).on('resize', function()
@@ -719,7 +703,7 @@ $(document).on("click", ".show-as-dialog-link", function(e)
 	var link = $(e.currentTarget).attr("href");
 
 	bootbox.dialog({
-		message: '<iframe height="650px" class="embed-responsive" src="' + link + '"></iframe>',
+		message: '<iframe height="650px" class="embed-responsive" onload="ResizeResponsiveEmbeds();" src="' + link + '"></iframe>',
 		size: 'large',
 		backdrop: true,
 		closeButton: false,
@@ -805,8 +789,3 @@ $(document).on("click", "#clear-filter-button", function(e)
 {
 	$(".tooltip").tooltip("hide");
 });
-
-$(document).on("shown.bs.modal", function(e)
-{
-	ResizeResponsiveEmbeds();
-})
diff --git a/public/viewjs/mealplan.js b/public/viewjs/mealplan.js
index fbc40cc1..f644bb39 100644
--- a/public/viewjs/mealplan.js
+++ b/public/viewjs/mealplan.js
@@ -927,7 +927,7 @@ $(document).on("click", ".display-recipe-button", function(e)
 		function(result)
 		{
 			bootbox.dialog({
-				message: '<iframe height="650px" class="embed-responsive" src="' + U("/recipes?embedded&recipe=") + objectId + '#fullscreen"></iframe>',
+				message: '<iframe height="650px" class="embed-responsive" onload="ResizeResponsiveEmbeds();" src="' + U("/recipes?embedded&recipe=") + objectId + '#fullscreen"></iframe>',
 				size: 'extra-large',
 				backdrop: true,
 				closeButton: false,
diff --git a/public/viewjs/quantityunitform.js b/public/viewjs/quantityunitform.js
index 366030bd..5c636723 100644
--- a/public/viewjs/quantityunitform.js
+++ b/public/viewjs/quantityunitform.js
@@ -198,7 +198,7 @@ $("#test-quantityunit-plural-forms-button").on("click", function(e)
 	$("#save-quantityunit-button").click();
 
 	bootbox.alert({
-		message: '<iframe height="400px" class="embed-responsive" src="' + U("/quantityunitpluraltesting?embedded&qu=") + Grocy.EditObjectId.toString() + '"></iframe>',
+		message: '<iframe height="400px" class="embed-responsive" onload="ResizeResponsiveEmbeds();" src="' + U("/quantityunitpluraltesting?embedded&qu=") + Grocy.EditObjectId.toString() + '"></iframe>',
 		closeButton: false,
 		size: "large",
 		callback: function(result)
diff --git a/public/viewjs/recipeform.js b/public/viewjs/recipeform.js
index 2c128404..301fceaf 100644
--- a/public/viewjs/recipeform.js
+++ b/public/viewjs/recipeform.js
@@ -220,7 +220,7 @@ $(document).on('click', '.recipe-pos-edit-button', function(e)
 	var recipePosId = $(e.currentTarget).attr('data-recipe-pos-id');
 
 	bootbox.dialog({
-		message: '<iframe height="650px" class="embed-responsive" src="' + U("/recipe/") + Grocy.EditObjectId.toString() + '/pos/' + recipePosId.toString() + '?embedded&product=' + productId.toString() + '"></iframe>',
+		message: '<iframe height="650px" class="embed-responsive" onload="ResizeResponsiveEmbeds();" src="' + U("/recipe/") + Grocy.EditObjectId.toString() + '/pos/' + recipePosId.toString() + '?embedded&product=' + productId.toString() + '"></iframe>',
 		size: 'large',
 		backdrop: true,
 		closeButton: false,
@@ -266,7 +266,7 @@ $("#recipe-pos-add-button").on("click", function(e)
 	e.preventDefault();
 
 	bootbox.dialog({
-		message: '<iframe height="650px" class="embed-responsive" src="' + U("/recipe/") + Grocy.EditObjectId + '/pos/new?embedded"></iframe>',
+		message: '<iframe height="650px" class="embed-responsive" onload="ResizeResponsiveEmbeds();" src="' + U("/recipe/") + Grocy.EditObjectId + '/pos/new?embedded"></iframe>',
 		size: 'large',
 		backdrop: true,
 		closeButton: false,
diff --git a/public/viewjs/recipes.js b/public/viewjs/recipes.js
index d37d7fa3..1e42577a 100644
--- a/public/viewjs/recipes.js
+++ b/public/viewjs/recipes.js
@@ -291,7 +291,7 @@ recipesTables.on('select', function(e, dt, type, indexes)
 		else
 		{
 			bootbox.dialog({
-				message: '<iframe height="650px" class="embed-responsive" src="' + U("/recipes?embedded&recipe=") + selectedRecipeId + '#fullscreen"></iframe>',
+				message: '<iframe height="650px" class="embed-responsive" onload="ResizeResponsiveEmbeds();" src="' + U("/recipes?embedded&recipe=") + selectedRecipeId + '#fullscreen"></iframe>',
 				size: 'extra-large',
 				backdrop: true,
 				closeButton: false,
@@ -323,7 +323,7 @@ $(".recipe-gallery-item").on("click", function(e)
 	else
 	{
 		bootbox.dialog({
-			message: '<iframe height="650px" class="embed-responsive" src="' + U("/recipes?embedded&recipe=") + selectedRecipeId + '#fullscreen"></iframe>',
+			message: '<iframe height="650px" class="embed-responsive" onload="ResizeResponsiveEmbeds();" src="' + U("/recipes?embedded&recipe=") + selectedRecipeId + '#fullscreen"></iframe>',
 			size: 'extra-large',
 			backdrop: true,
 			closeButton: false,
diff --git a/public/viewjs/shoppinglist.js b/public/viewjs/shoppinglist.js
index 27bbe8a2..02314886 100644
--- a/public/viewjs/shoppinglist.js
+++ b/public/viewjs/shoppinglist.js
@@ -258,6 +258,7 @@ $(document).on('click', '.shopping-list-stock-add-workflow-list-item-button', fu
 	}
 	else
 	{
+		$("#shopping-list-stock-add-workflow-purchase-item-count").addClass("d-none");
 		$("#shopping-list-stock-add-workflow-skip-button").addClass("d-none");
 	}
 });
@@ -623,3 +624,8 @@ if ($(window).width() < 768 || !Grocy.FeatureFlags.GROCY_FEATURE_FLAG_STOCK)
 {
 	$("#filter-container").removeClass("border-bottom");
 }
+
+$("#shopping-list-stock-add-workflow-purchase-form-frame").on("load", function()
+{
+	ResizeResponsiveEmbeds();
+});
diff --git a/views/shoppinglist.blade.php b/views/shoppinglist.blade.php
index 2c4e4b4d..33b785fd 100644
--- a/views/shoppinglist.blade.php
+++ b/views/shoppinglist.blade.php
@@ -321,8 +321,8 @@
 		<div class="modal-content text-center">
 			<div class="modal-body">
 				<iframe id="shopping-list-stock-add-workflow-purchase-form-frame"
-					class="embed-responsive"
-					src=""></iframe>
+					class="embed-responsive">
+				</iframe>
 			</div>
 			<div class="modal-footer">
 				<span id="shopping-list-stock-add-workflow-purchase-item-count"