diff --git a/InvenTree/templates/js/modals.js b/InvenTree/templates/js/modals.js
index a55a62746c..7ac19ec4ce 100644
--- a/InvenTree/templates/js/modals.js
+++ b/InvenTree/templates/js/modals.js
@@ -797,6 +797,14 @@ function handleModalForm(url, options) {
                             if (response.title) {
                                 modalSetTitle(modal, response.title);
                             }
+
+                            // Clean custom action buttons
+                            $(modal).find('#modal-footer-buttons').html('');
+
+                            // Add custom action buttons with response
+                            if (response.buttons) {
+                                attachButtons(modal, response.buttons);
+                            }
                         }
                         else {
                             $(modal).modal('hide');
@@ -902,6 +910,11 @@ function launchModalForm(url, options = {}) {
                     attachButtons(modal, options.buttons);
                 }
 
+                // Add custom buttons from response
+                if (response.buttons) {
+                    attachButtons(modal, response.buttons);
+                }
+
             } else {
                 $(modal).modal('hide');
                 showAlertDialog('{% trans "Invalid server response" %}', '{% trans "JSON response missing form data" %}');