diff --git a/lib/ace/renderloop.js b/lib/ace/renderloop.js
index c581fbc1..2adcdf03 100644
--- a/lib/ace/renderloop.js
+++ b/lib/ace/renderloop.js
@@ -37,6 +37,7 @@
 
 define(function(require, exports, module) {
 
+var event = require("./lib/event")
 
 var RenderLoop = function(onRender) {
     this.onRender = onRender;
@@ -68,12 +69,12 @@ var RenderLoop = function(onRender) {
         this.setTimeoutZero = function(callback) {
             if (!this.attached) {
                 var _self = this;
-                window.addEventListener("message", function(e) {
+                event.addListener(window, "message", function(e) {
                     if (e.source == window && _self.callback && e.data == _self.messageName) {
-                        e.stopPropagation();
+                        event.stopPropagation(e);
                         _self.callback();
                     }
-                }, false);
+                });
                 this.attached = true;
             }
             this.callback = callback;