diff --git a/lib/ace/ext/language_tools.js b/lib/ace/ext/language_tools.js
index b739eabe..b505fcfa 100644
--- a/lib/ace/ext/language_tools.js
+++ b/lib/ace/ext/language_tools.js
@@ -145,7 +145,18 @@ var onChangeAutocomplete = function(e, editor) {
 
     // Only autocomplete if there's a prefix that can be matched
     if(prefix !== '' && !(hasCompleter)) {
-        Autocomplete.startCommand.exec(editor);
+        if (!editor.completer) {
+            // Create new autocompleter
+            editor.completer = new Autocomplete();
+
+            // Disable autoInsert
+            editor.completer.autoInsert = false;
+        }
+
+        editor.completer.showPopup(editor);
+        // needed for firefox on mac
+        editor.completer.cancelContextMenu();
+
     } else if(prefix === '' && hasCompleter) {
         // When the prefix is empty
         // close the autocomplete dialog