diff --git a/static/js/editor.js b/static/js/editor.js
index 03a452f7..f9dc7d95 100644
--- a/static/js/editor.js
+++ b/static/js/editor.js
@@ -15,6 +15,15 @@ pandora.ui.editor = function(data) {
             annotationsTooltip: Ox._('annotations')
                 + ' <span class="OxBright">' + Ox.SYMBOLS.shift + 'A</span>',
             audioTrack: data.audioTrack,
+            autocomplete: function(key, value, callback) {
+                pandora.api.autocompleteEntity({
+                    key: key,
+                    operator: '=',
+                    value: value
+                }, function(result) {
+                    callback(result.data.items);
+                })
+            },
             censored: data.censored,
             censoredIcon: pandora.site.cantPlay.icon,
             censoredTooltip: Ox._(pandora.site.cantPlay.text),