diff --git a/Bootstrap.Admin/wwwroot/lib/longbow/longbow.common.js b/Bootstrap.Admin/wwwroot/lib/longbow/longbow.common.js
index 3c6d782f..f775df06 100644
--- a/Bootstrap.Admin/wwwroot/lib/longbow/longbow.common.js
+++ b/Bootstrap.Admin/wwwroot/lib/longbow/longbow.common.js
@@ -145,24 +145,22 @@
             var loadingHandler = null;
             if (options.loading && options.modal) {
                 var $modal = $(options.modal);
-                if (!$modal.hasClass('event')) {
-                    $modal.on('shown.bs.modal', function () {
-                        var $this = $(this);
-                        if (loadingHandler !== null) {
-                            window.clearTimeout(loadingHandler);
-                            loadingHandler = null;
-                        }
-                        if ($this.hasClass(loadFlag)) return;
-                        $this.modal('hide');
-                    });
-                }
+                $modal.on('shown.bs.modal', function () {
+                    var $this = $(this);
+                    if (loadingHandler !== null) {
+                        window.clearTimeout(loadingHandler);
+                        loadingHandler = null;
+                    }
+                    if ($this.hasClass(loadFlag)) return;
+                    $this.modal('hide');
+                });
                 loadingHandler = window.setTimeout(function () { $(options.modal).addClass(loadFlag).modal('show'); }, 300);
-                setTimeout(function () {
+                var loadTimeoutHandler = setTimeout(function () {
                     $(options.modal).find('.close').removeClass('d-none');
+                    clearTimeout(loadTimeoutHandler);
                 }, options.loadingTimeout);
             }
 
-
             var data = options.method === 'get' ? options.data : JSON.stringify(options.data);
             var url = options.id !== '' ? options.url + '/' + options.id : options.url;
             if (options.query) {