diff --git a/webroot/rsrc/externals/javelin/lib/control/tokenizer/Tokenizer.js b/webroot/rsrc/externals/javelin/lib/control/tokenizer/Tokenizer.js
index 60f7df8063..b626f9fc73 100644
--- a/webroot/rsrc/externals/javelin/lib/control/tokenizer/Tokenizer.js
+++ b/webroot/rsrc/externals/javelin/lib/control/tokenizer/Tokenizer.js
@@ -465,8 +465,12 @@ JX.install('Tokenizer', {
       new JX.Workflow(uri, {exclude: JX.keys(this.getTokens()).join(',')})
         .setHandler(
           JX.bind(this, function(r) {
-            this._typeahead.getDatasource().addResult(r.token);
-            this.addToken(r.key);
+            var source = this._typeahead.getDatasource();
+
+            source.addResult(r.token);
+            var result = source.getResult(r.key);
+
+            this.addToken(r.key, result.name);
             this.focus();
           }))
         .start();