diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
index e7cfc23ab6..f3c27d8efd 100644
--- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
+++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
@@ -4485,36 +4485,3 @@ div .suggestion_note {
         border-bottom-right-radius: 5px;
     }
 }
-
-@media print {
-    body.modalprinter * {
-        visibility: hidden;
-    }
-
-    body.modalprinter .modal-dialog.focused {
-        position: absolute;
-        padding: 0;
-        margin: 0;
-        left: 0;
-        top: 0;
-    }
-
-    body.modalprinter .modal-dialog.focused .modal-content {
-        border-width: 0;
-    }
-
-    body.modalprinter .modal-dialog.focused .modal-content .modal-header .modal-title,
-    body.modalprinter .modal-dialog.focused .modal-content .modal-body,
-    body.modalprinter .modal-dialog.focused .modal-content .modal-body * {
-        visibility: visible;
-    }
-
-    body.modalprinter .modal-dialog.focused .modal-content .modal-header,
-    body.modalprinter .modal-dialog.focused .modal-content .modal-body {
-        padding: 0;
-    }
-
-    body.modalprinter .modal-dialog.focused .modal-content .modal-header .modal-title {
-        margin-bottom: 20px;
-    }
-}
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
index 9df383d3cc..825ae64910 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
@@ -1601,22 +1601,6 @@
                 "order": [[ 1, 'asc' ], [ 0, 'asc' ]]
             }));
 
-            // print modals
-            $('.modal.printable').on('shown.bs.modal', function() {
-                $('.modal-dialog', this).addClass('focused');
-                $('body').addClass('modalprinter');
-
-                if ($(this).hasClass('autoprint')) {
-                    window.print();
-                }
-            }).on('hidden.bs.modal', function() {
-                $('.modal-dialog', this).removeClass('focused');
-                $('body').removeClass('modalprinter');
-            });
-
-            $('.printModal').click(function() {
-                window.print();
-            });
             [% IF ( !(Koha.Preference('TransfersBlockCirc')) && Koha.Preference('AutomaticConfirmTransfer') ) %]
                 $("#wrong-transfer-modal").on('hidden.bs.modal',function(){
                     $("#wrongtransferform").submit();
@@ -1628,6 +1612,7 @@
                 [% END %]
             [% END %]
         });
+        [% Asset.js("js/modal_printer.js") | $raw %]
     </script>
 
 [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt
index 21c4329512..ce95116c8e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt
@@ -351,6 +351,7 @@
     [% INCLUDE 'format_price.inc' %]
     [% INCLUDE 'js-date-format.inc' %]
     [% Asset.js("js/cashup_modal.js") | $raw %]
+    [% Asset.js("js/modal_printer.js") | $raw %]
     [% INCLUDE 'calendar.inc' %]
     <script>
         var sales_table = $("#sales").dataTable($.extend(true, {}, dataTablesDefaults, {
diff --git a/koha-tmpl/intranet-tmpl/prog/js/cashup_modal.js b/koha-tmpl/intranet-tmpl/prog/js/cashup_modal.js
index dceca2f07b..a28e32a8ff 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/cashup_modal.js
+++ b/koha-tmpl/intranet-tmpl/prog/js/cashup_modal.js
@@ -41,60 +41,4 @@ $(document).ready(function() {
             }
         });
     });
-
-    $('.modal.printable').on('shown.bs.modal', function() {
-        $('.modal-dialog', this).addClass('focused');
-        $('body').addClass('modalprinter');
-
-        if ($(this).hasClass('autoprint')) {
-            window.print();
-        }
-    }).on('hidden.bs.modal', function() {
-        $('.modal-dialog', this).removeClass('focused');
-        $('body').removeClass('modalprinter');
-    });
-
-    $('.printModal').click(function() {
-
-        let contents = $('#cashupSummaryModal .modal-body').html();
-        let win = window.open('','');
-        win.document.write(`
-            <style>
-                table {
-                    background-color: #FFFFFF;
-                    border-bottom: 1px solid #CCCCCC;
-                    border-collapse: collapse;
-                    border-left: 1px solid #CCCCCC;
-                    margin: 3px 0 5px 0;
-                    padding: 0;
-                    width: 99%;
-                }
-
-                td {
-                    background-color: #FFF;
-                    border-bottom: 1px solid #CCCCCC;
-                    border-left: 0;
-                    border-right: 1px solid #CCCCCC;
-                    border-top: 0;
-                    font-size: 12px;
-                    padding: 5px 5px 5px 5px;
-                }
-
-                th {
-                    background-color: #E9E9E9;
-                    border-bottom: 1px solid #CCCCCC;
-                    border-left: 0;
-                    border-right: 1px solid #CCCCCC;
-                    border-top: 0;
-                    font-size: 14px;
-                    font-weight: bold;
-                    padding: 5px 5px 5px 5px;
-                    text-align: left;
-                }
-            </style>
-        `)
-        win.document.write( contents );
-        win.print();
-        win.close();
-    });
 });
diff --git a/koha-tmpl/intranet-tmpl/prog/js/modal_printer.js b/koha-tmpl/intranet-tmpl/prog/js/modal_printer.js
new file mode 100644
index 0000000000..ee64d4e98d
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/js/modal_printer.js
@@ -0,0 +1,63 @@
+$(document).ready(function() {
+
+    function modalPrint() {
+        let title = $('.modal-dialog.focused .modal-title').html();
+        let contents = $('.modal-dialog.focused .modal-body').html();
+        let win = window.open('','');
+        win.document.write(`
+            <style>
+                table {
+                    background-color: #FFFFFF;
+                    border-bottom: 1px solid #CCCCCC;
+                    border-collapse: collapse;
+                    border-left: 1px solid #CCCCCC;
+                    margin: 3px 0 5px 0;
+                    padding: 0;
+                    width: 99%;
+                }
+
+                td {
+                    background-color: #FFF;
+                    border-bottom: 1px solid #CCCCCC;
+                    border-left: 0;
+                    border-right: 1px solid #CCCCCC;
+                    border-top: 0;
+                    font-size: 12px;
+                    padding: 5px 5px 5px 5px;
+                }
+
+                th {
+                    background-color: #E9E9E9;
+                    border-bottom: 1px solid #CCCCCC;
+                    border-left: 0;
+                    border-right: 1px solid #CCCCCC;
+                    border-top: 0;
+                    font-size: 14px;
+                    font-weight: bold;
+                    padding: 5px 5px 5px 5px;
+                    text-align: left;
+                }
+            </style>
+        `)
+        win.document.write( title );
+        win.document.write( contents );
+        win.print();
+        win.close();
+    }
+
+    // Set focused on printable modals on open and autoprint if required
+    $('.modal.printable').on('shown.bs.modal', function() {
+        $('.modal-dialog', this).addClass('focused');
+
+        if ($(this).hasClass('autoprint')) {
+            modalPrint();
+        }
+    }).on('hidden.bs.modal', function() {
+        $('.modal-dialog', this).removeClass('focused');
+    });
+
+    // Trigger print on button click
+    $('.printModal').click(function() {
+        modalPrint();
+    });
+});