diff --git a/module/VuFind/src/VuFind/Controller/CartController.php b/module/VuFind/src/VuFind/Controller/CartController.php
index cacb65aec3bda37e5e5a2a6e269122a0bc7a58b5..c0139c528e7e7030d88ed68bb3e17018182afcb6 100644
--- a/module/VuFind/src/VuFind/Controller/CartController.php
+++ b/module/VuFind/src/VuFind/Controller/CartController.php
@@ -76,7 +76,7 @@ class CartController extends AbstractBase
     {
         // We came in from the cart -- let's remember this we can redirect there
         // when we're done:
-        $this->session->url = $this->url()->fromRoute('cart-home');
+        $this->session->url = $this->getLightboxAwareUrl('cart-home');
 
         // Now forward to the requested action:
         if (strlen($this->params()->fromPost('email', '')) > 0) {
diff --git a/themes/bootstrap/js/lightbox.js b/themes/bootstrap/js/lightbox.js
index 5719f04f1530d266796aad42e724ba0e8623c46c..1c40b3e0feabb5d5118c35530238e3f4e90cc04b 100644
--- a/themes/bootstrap/js/lightbox.js
+++ b/themes/bootstrap/js/lightbox.js
@@ -19,7 +19,7 @@ function registerModalEvents(modal) {
   // Highlight which submit button clicked
   $(modal).find("form input[type=submit]").click(function() {
     $(this).attr("clicked", "true");
-    $(this).prepend('<i class="icon-spinner icon-spin"></i> ');
+    $(this).after(' <i class="icon-spinner icon-spin"></i> ');
 });
 }
 // Prevent forms from submitting in the lightbox