diff --git a/demo/autoresize.html b/demo/autoresize.html
index 2b64d96a..73a87599 100644
--- a/demo/autoresize.html
+++ b/demo/autoresize.html
@@ -26,28 +26,32 @@
 <div class="scrollmargin"></div>
 <pre id="editor"></pre>
 
-<script src="../build/src/ace.js"></script>
+<script src="kitchen-sink/require.js"></script>
 <script>
+// setup paths
+require.config({paths: { "ace" : "../lib/ace"}});
+// load ace and extensions
+require(["ace/ace"], function(ace) {
 
-var editor1 = ace.edit("editor1");
-editor1.setTheme("ace/theme/tomorrow_night_eighties");
-editor1.session.setMode("ace/mode/html");
-editor1.setAutoScrollEditorIntoView(true);
-editor1.setOption("maxLines", 30);
+    var editor1 = ace.edit("editor1");
+    editor1.setTheme("ace/theme/tomorrow_night_eighties");
+    editor1.session.setMode("ace/mode/html");
+    editor1.setAutoScrollEditorIntoView(true);
+    editor1.setOption("maxLines", 30);
 
-var editor2 = ace.edit("editor2");
-editor2.setTheme("ace/theme/tomorrow_night_blue");
-editor2.session.setMode("ace/mode/html");
-editor2.setAutoScrollEditorIntoView(true);
-editor2.setOption("maxLines", 30);
-editor2.setOption("minLines", 2);
-
-var editor = ace.edit("editor");
-editor.setTheme("ace/theme/tomorrow");
-editor.session.setMode("ace/mode/html");
-editor.setAutoScrollEditorIntoView(true);
-editor.setOption("maxLines", 100);
+    var editor2 = ace.edit("editor2");
+    editor2.setTheme("ace/theme/tomorrow_night_blue");
+    editor2.session.setMode("ace/mode/html");
+    editor2.setAutoScrollEditorIntoView(true);
+    editor2.setOption("maxLines", 30);
+    editor2.setOption("minLines", 2);
 
+    var editor = ace.edit("editor");
+    editor.setTheme("ace/theme/tomorrow");
+    editor.session.setMode("ace/mode/html");
+    editor.setAutoScrollEditorIntoView(true);
+    editor.setOption("maxLines", 100);
+});
 </script>
 
 <script src="./show_own_source.js"></script>
diff --git a/lib/ace/mouse/mouse_handler.js b/lib/ace/mouse/mouse_handler.js
index f4b46c34..9897290c 100644
--- a/lib/ace/mouse/mouse_handler.js
+++ b/lib/ace/mouse/mouse_handler.js
@@ -47,7 +47,11 @@ var MouseHandler = function(editor) {
     new DefaultGutterHandler(this);
     new DragdropHandler(this);
     
-    var focusEditor = function(e) { editor.focus() };
+    var focusEditor = function(e) { 
+        if (!editor.isFocused() && editor.textInput)
+            editor.textInput.onContextMenu(e);
+        editor.focus() 
+    };
     
     var mouseTarget = editor.renderer.getMouseEventTarget();
     event.addListener(mouseTarget, "click", this.onMouseEvent.bind(this, "click"));