diff --git a/public/js/icinga/behavior/input-enrichment.js b/public/js/icinga/behavior/input-enrichment.js
index 824afffc1..58df5e6c2 100644
--- a/public/js/icinga/behavior/input-enrichment.js
+++ b/public/js/icinga/behavior/input-enrichment.js
@@ -27,8 +27,8 @@
     var InputEnrichment = function (icinga) {
         Icinga.EventListener.call(this, icinga);
 
-        this.on('beforerender', this.onBeforeRender, this);
-        this.on('rendered', this.onRendered, this);
+        this.on('beforerender', '#main > .container, #modal-content', this.onBeforeRender, this);
+        this.on('rendered', '#main > .container, #modal-content', this.onRendered, this);
 
         /**
          * Enriched inputs