diff --git a/demo/kitchen-sink/demo.js b/demo/kitchen-sink/demo.js
index 29be01be..ce5d57ad 100644
--- a/demo/kitchen-sink/demo.js
+++ b/demo/kitchen-sink/demo.js
@@ -65,7 +65,7 @@ var bindCheckbox = util.bindCheckbox;
 var bindDropdown = util.bindDropdown;
 
 /*********** create editor ***************************/
-var container = document.getElementById("editor");
+var container = document.getElementById("editor-container");
 
 // Splitting.
 var Split = require("ace/split").Split;
diff --git a/demo/kitchen-sink/styles.css b/demo/kitchen-sink/styles.css
index ec3578aa..fba03773 100644
--- a/demo/kitchen-sink/styles.css
+++ b/demo/kitchen-sink/styles.css
@@ -21,7 +21,7 @@ body {
     margin-left: 70px;
 }
 
-#editor {
+#editor-container {
     position: absolute;
     top:  0px;
     left: 280px;
diff --git a/kitchen-sink.html b/kitchen-sink.html
index 1140d2a4..ac241fa1 100644
--- a/kitchen-sink.html
+++ b/kitchen-sink.html
@@ -254,7 +254,7 @@
   </div>
   </div>
 </div>
-  <div id="editor"></div>
+  <div id="editor-container"></div>
 
 <!--DEVEL-->
   <script type="text/javascript">
diff --git a/lib/ace/keyboard/textinput.js b/lib/ace/keyboard/textinput.js
index 0f918dcf..3321f2b9 100644
--- a/lib/ace/keyboard/textinput.js
+++ b/lib/ace/keyboard/textinput.js
@@ -368,7 +368,7 @@ var TextInput = function(parentNode, host) {
         // text.style.cssText += "background:rgba(250, 0, 0, 0.3); opacity:1;";
 
         resetSelection(host.selection.isEmpty());
-        host._emit("nativecontextmenu", {target: editor});
+        host._emit("nativecontextmenu", {target: host});
         var rect = host.container.getBoundingClientRect();
         var move = function(e) {
             text.style.left = e.clientX - rect.left - 2 + "px";