diff --git a/lib/ace/autocomplete.js b/lib/ace/autocomplete.js
index 4638d959..f0252680 100644
--- a/lib/ace/autocomplete.js
+++ b/lib/ace/autocomplete.js
@@ -137,14 +137,15 @@ var Autocomplete = function() {
         if (data.completer && data.completer.insertMatch) {
             data.completer.insertMatch(this.editor);
         } else {
-            if (data.value)
-                data = data.value;
             if (this.completions.filterText) {
                 var range = this.editor.selection.getRange();
                 range.start.column -= this.completions.filterText.length;
                 this.editor.session.remove(range);
             }
-            snippetManager.insertSnippet(this.editor, data);
+            if (data.snippet)
+                snippetManager.insertSnippet(this.editor, data.snippet);
+            else
+                this.editor.insert(data.value || data);
         }
     };
 
diff --git a/lib/ace/ext/language_tools.js b/lib/ace/ext/language_tools.js
index 4c6cbe08..0a9a3fd0 100644
--- a/lib/ace/ext/language_tools.js
+++ b/lib/ace/ext/language_tools.js
@@ -65,8 +65,8 @@ var snippetCompleter = {
                 if (s.tabTrigger && s.tabTrigger.indexOf(prefix) === 0)
                     completions.push({
                         caption: s.tabTrigger,
-                        value: s.content,
-                        meta: 'snippet'
+                        snippet: s.content,
+                        meta: "snippet"
                     });
             }
         }, this);