diff --git a/lib/ace/autocomplete.js b/lib/ace/autocomplete.js
index de404815..35c5aaa8 100644
--- a/lib/ace/autocomplete.js
+++ b/lib/ace/autocomplete.js
@@ -210,8 +210,11 @@ var Autocomplete = function() {
             completer.getCompletions(editor, session, pos, prefix, function(err, results) {
                 if (!err)
                     matches = matches.concat(results);
+            // Fetch prefix again, because they may have changed by now
+            var pos = editor.getCursorPosition();
+            var line = session.getLine(pos.row);
             callback(null, {
-                prefix: prefix,
+                prefix: util.retrievePrecedingIdentifier(line, pos.column),
                     matches: matches,
                     finished: (--total === 0)
             });