diff --git a/public/js/icinga/loader.js b/public/js/icinga/loader.js
index 56e2f8532..a6f1de885 100644
--- a/public/js/icinga/loader.js
+++ b/public/js/icinga/loader.js
@@ -636,6 +636,8 @@
                 }
             }
 
+            req.$target.trigger('rendered');
+
             this.icinga.ui.refreshDebug();
         },
 
@@ -795,9 +797,6 @@
                 }, 0);
             }
 
-            // TODO: this.icinga.events.refreshContainer(container);
-            $container.trigger('rendered');
-
             if (scrollPos !== false) {
                 $container.scrollTop(scrollPos);
             }