diff --git a/public/js/icinga/behavior/collapsible.js b/public/js/icinga/behavior/collapsible.js
index 7f8962262..5c07edfff 100644
--- a/public/js/icinga/behavior/collapsible.js
+++ b/public/js/icinga/behavior/collapsible.js
@@ -26,8 +26,8 @@
             Icinga.Storage.BehaviorStorage('collapsible'),
             'expanded'
         )
-            .on('add', { self: this }, this.onExternalExpansion)
-            .on('delete', { self: this }, this.onExternalCollapse);
+            .on('add', this.onExternalExpansion, this)
+            .on('delete', this.onExternalCollapse, this);
     };
     Collapsible.prototype = new Icinga.EventListener();
 
@@ -90,12 +90,11 @@
      * @param   {Event}     event
      * @param   {string}    collapsiblePath
      */
-    Collapsible.prototype.onExternalExpansion = function(event, collapsiblePath) {
-        var _this = event.data.self;
+    Collapsible.prototype.onExternalExpansion = function(collapsiblePath) {
         var $collapsible = $(collapsiblePath);
 
         if ($collapsible.length && $collapsible.is('.can-collapse')) {
-            _this.expand($collapsible);
+            this.expand($collapsible);
         }
     };
 
@@ -105,12 +104,11 @@
      * @param   {Event}     event
      * @param   {string}    collapsiblePath
      */
-    Collapsible.prototype.onExternalCollapse = function(event, collapsiblePath) {
-        var _this = event.data.self;
+    Collapsible.prototype.onExternalCollapse = function(collapsiblePath) {
         var $collapsible = $(collapsiblePath);
 
-        if ($collapsible.length && _this.canCollapse($collapsible)) {
-            _this.collapse($collapsible);
+        if ($collapsible.length && this.canCollapse($collapsible)) {
+            this.collapse($collapsible);
         }
     };
 
diff --git a/public/js/icinga/storage.js b/public/js/icinga/storage.js
index 8be8e68e5..2f991afcb 100644
--- a/public/js/icinga/storage.js
+++ b/public/js/icinga/storage.js
@@ -1,6 +1,6 @@
 /*! Icinga Web 2 | (c) 2019 Icinga GmbH | GPLv2+ */
 
-(function (Icinga, $) {
+;(function (Icinga) {
 
     'use strict';
 
@@ -129,8 +129,6 @@
     /**
      * Icinga.Storage.StorageAwareMap
      *
-     * Emits events `StorageAwareMapDelete` and `StorageAwareMapAdd` in case an update occurs in the storage.
-     *
      * @param   {object} items
      * @constructor
      */
@@ -150,6 +148,16 @@
          */
         this.key = undefined;
 
+        /**
+         * Event listeners for our internal events
+         *
+         * @type {{}}
+         */
+        this.eventListeners = {
+            'add': [],
+            'delete': []
+        };
+
         /**
          * The internal (real) map
          *
@@ -244,8 +252,9 @@
             // Check for deletions first. Uses keys() to iterate over a copy
             this.keys().forEach(function (key) {
                 if (newValue === null || typeof newValue[key] === 'undefined') {
-                    $(window).trigger('StorageAwareMapDelete', [key, this.data.get(key)['value']]);
+                    var value = this.data.get(key)['value'];
                     this.data.delete(key);
+                    this.trigger('delete', key, value);
                 }
             }, this);
 
@@ -260,7 +269,7 @@
                 this.data.set(key, newValue[key]);
 
                 if (! known) {
-                    $(window).trigger('StorageAwareMapAdd', [key, newValue[key]['value']]);
+                    this.trigger('add', key, newValue[key]['value']);
                 }
             }, this);
         },
@@ -268,25 +277,42 @@
         /**
          * Register an event handler to handle storage updates
          *
-         * Available events are: add, delete. The handler receives the
-         * key and its value as second and third argument, respectively.
+         * Available events are: add, delete. The callback receives the
+         * key and its value as first and second argument, respectively.
          *
          * @param   {string}    event
-         * @param   {object}    data
-         * @param   {function}  handler
+         * @param   {function}  callback
+         * @param   {object}    thisArg
          *
          * @returns {this}
          */
-        on: function(event, data, handler) {
-            $(window).on(
-                'StorageAwareMap' + event.charAt(0).toUpperCase() + event.slice(1),
-                data,
-                handler
-            );
+        on: function(event, callback, thisArg) {
+            if (typeof this.eventListeners[event] === 'undefined') {
+                throw new Error('Invalid event "' + event + '"');
+            }
 
+            this.eventListeners[event].push([callback, thisArg]);
             return this;
         },
 
+        /**
+         * Trigger all event handlers for the given event
+         *
+         * @param   {string}    event
+         * @param   {string}    key
+         * @param   {*}         value
+         */
+        trigger: function(event, key, value) {
+            this.eventListeners[event].forEach(function (handler) {
+                var thisArg = handler[1];
+                if (typeof thisArg === 'undefined') {
+                    thisArg = this;
+                }
+
+                handler[0].call(thisArg, key, value);
+            });
+        },
+
         /**
          * Return the number of key/value pairs in the map
          *
@@ -453,4 +479,4 @@
         }
     };
 
-}(Icinga, jQuery));
+}(Icinga));