diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/jquery-form/jquery-form-extensions.js b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/jquery-form/jquery-form-extensions.js
index 2ae8d02318..0e7b6698a6 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/jquery-form/jquery-form-extensions.js
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/jquery-form/jquery-form-extensions.js
@@ -71,7 +71,10 @@
         options.complete = function (jqXhr, status, $form) {
             if ($.contains(document, $form[0])) {
                 $form.find("button[type='submit']").buttonBusy(false);
-                //TODO: Re-enable other buttons..?
+                if (!userOptions.formSubmitting.disableOtherButtonsBusy) {
+                    var otherButtons = $form.find("button[type!=submit]").not(userOptions.formSubmitting.$excludedBusyButtons);
+                    otherButtons.prop('disabled', false);
+                }
             }
 
             $form.trigger('abp-ajax-complete',