diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
index d916d73973..8ea412792d 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
@@ -385,7 +385,7 @@
                                 </div>
                             [% ELSE %]
                                 <h3>Shibboleth login</h3>
-                                <p><a href="[% shibbolethLoginUrl | $raw %]">Log in using a Shibboleth account</a>.</p>
+                                <p><a id="shib_url" href="[% shibbolethLoginUrl | $raw %]">Log in using a Shibboleth account</a>.</p>
                                 [% UNLESS Koha.Preference('opacShibOnly') %]
                                     <h3>Local login</h3>
                                 [% END %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/js/modals/checkout.js b/koha-tmpl/opac-tmpl/bootstrap/js/modals/checkout.js
index f846a1bf57..1243ee67c8 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/js/modals/checkout.js
+++ b/koha-tmpl/opac-tmpl/bootstrap/js/modals/checkout.js
@@ -68,6 +68,9 @@ $(document).ready(function() {
            let url = new URL(window.location.href);
            url.searchParams.append('modal','checkout');
            $('#modalAuth').append('<input type="hidden" name="return" value="' + url.href +'" />');
+           $('#shib_login').each(function(){
+               this.url = this.url.replace(/target=(.*)/, "target=" + url.href);
+           });
            $('#loginModal').modal('show');
            return false;
        }