diff --git a/public/css/grocy.css b/public/css/grocy.css
index 83e73bd5..a8f31e45 100644
--- a/public/css/grocy.css
+++ b/public/css/grocy.css
@@ -203,6 +203,10 @@ td {
 	}
 }
 
+html {
+	min-height: inherit;
+}
+
 /* Third party component customizations - Tempus Dominus */
 .date-only-datetimepicker .bootstrap-datetimepicker-widget.dropdown-menu {
 	width: auto !important;
diff --git a/public/viewjs/shoppinglist.js b/public/viewjs/shoppinglist.js
index 406fb115..680800c4 100644
--- a/public/viewjs/shoppinglist.js
+++ b/public/viewjs/shoppinglist.js
@@ -140,7 +140,7 @@ $(document).on('click', '.shopping-list-stock-add-workflow-list-item-button', fu
 
 	if (Grocy.ShoppingListToStockWorkflowAll)
 	{
-		$("#shopping-list-stock-add-workflow-modal .modal-footer").removeClass("d-none");
+		$("#shopping-list-stock-add-workflow-purchase-item-count").removeClass("d-none");
 		$("#shopping-list-stock-add-workflow-purchase-item-count").text(L("Adding shopping list item #1 of #2", Grocy.ShoppingListToStockWorkflowCurrent, Grocy.ShoppingListToStockWorkflowCount));
 	}
 });
diff --git a/views/shoppinglist.blade.php b/views/shoppinglist.blade.php
index e96b1141..27438bd7 100644
--- a/views/shoppinglist.blade.php
+++ b/views/shoppinglist.blade.php
@@ -95,7 +95,7 @@
 		</table>
 	</div>
 
-	<div class="col-xs-12 col-md-4">
+	<div class="col-xs-12 col-md-4 mt-md-2">
 		@include('components.calendarcard')
 	</div>
 </div>
@@ -106,8 +106,9 @@
 			<div class="modal-body">
 				<iframe id="shopping-list-stock-add-workflow-purchase-form-frame" class="embed-responsive" src=""></iframe>
 			</div>
-			<div class="modal-footer d-none">
-				<span id="shopping-list-stock-add-workflow-purchase-item-count"></span>
+			<div class="modal-footer">
+				<span id="shopping-list-stock-add-workflow-purchase-item-count" class="d-none mr-auto"></span>
+				<button type="button" class="btn btn-secondary" data-dismiss="modal">{{ $L('Close') }}</button>
 			</div>
 		</div>
 	</div>