diff --git a/public/js/icinga/events.js b/public/js/icinga/events.js
index 5678b66e4..363ef5045 100644
--- a/public/js/icinga/events.js
+++ b/public/js/icinga/events.js
@@ -348,8 +348,8 @@
             }
 
             // Show a spinner depending on how the form is being submitted
-            if (autosubmit && typeof $el !== 'undefined' && $el.next().hasClass('spinner')) {
-                $el.next().addClass('active');
+            if (autosubmit && typeof $el !== 'undefined' && $el.siblings('.spinner').length) {
+                $el.siblings('.spinner').first().addClass('active');
             } else if ($button.length && $button.is('button') && $button.hasClass('animated')) {
                 $button.addClass('active');
             } else if ($button.length && $button.attr('data-progress-label')) {