diff --git a/demo/kitchen-sink/demo.js b/demo/kitchen-sink/demo.js
index 88881724..bcd240ff 100644
--- a/demo/kitchen-sink/demo.js
+++ b/demo/kitchen-sink/demo.js
@@ -301,7 +301,8 @@ split.on("focus", function(editor) {
 });
 env.split = split;
 window.env = env;
-window.ace = env.editor;
+window.editor = window.ace = env.editor;
+env.editor.setAnimatedScroll(true);
 
 var docEl = document.getElementById("doc");
 var modeEl = document.getElementById("mode");
@@ -395,13 +396,13 @@ function saveOption(el, val) {
     }
 }
 
-themeEl.addEventListener("mouseover", function(e){
+event.addListener(themeEl, "mouseover", function(e){
     this.desiredValue = e.target.value;
     if (!this.$timer)
         this.$timer = setTimeout(this.updateTheme);
 })
 
-themeEl.addEventListener("mouseout", function(e){
+event.addListener(themeEl, "mouseout", function(e){
     this.desiredValue = null;
     if (!this.$timer)
         this.$timer = setTimeout(this.updateTheme, 20);
@@ -486,7 +487,6 @@ bindCheckbox("show_hscroll", function(checked) {
     env.editor.renderer.setHScrollBarAlwaysVisible(checked);
 });
 
-env.editor.setAnimatedScroll(true);
 bindCheckbox("animate_scroll", function(checked) {
     env.editor.setAnimatedScroll(checked);
 });
diff --git a/lib/ace/multi_select.js b/lib/ace/multi_select.js
index 09a5deea..d88b33ec 100644
--- a/lib/ace/multi_select.js
+++ b/lib/ace/multi_select.js
@@ -42,6 +42,7 @@ var RangeList = require("./range_list").RangeList;
 var Range = require("./range").Range;
 var Selection = require("./selection").Selection;
 var onMouseDown = require("./mouse/multi_select_handler").onMouseDown;
+var event = require("./lib/event");
 exports.commands = require("./commands/multi_select_commands");
 
 // Todo: session.find or editor.findVolatile that returns range
@@ -734,7 +735,7 @@ function addAltCursorListeners(editor){
     var el = editor.textInput.getElement();
     var altCursor = false;
     var contentEl = editor.renderer.content;
-    el.addEventListener("keydown", function(e) {
+    event.addListener(el, "keydown", function(e) {
         if (e.keyCode == 18 && !(e.ctrlKey || e.shiftKey || e.metaKey)) {
             if (!altCursor) {
                 contentEl.style.cursor = "crosshair";
@@ -745,8 +746,8 @@ function addAltCursorListeners(editor){
         }
     });
 
-    el.addEventListener("keyup", reset);
-    el.addEventListener("blur", reset);
+    event.addListener(el, "keyup", reset);
+    event.addListener(el, "blur", reset);
     function reset() {
         if (altCursor) {
             contentEl.style.cursor = "";