diff --git a/static/js/editor.js b/static/js/editor.js
index 7e7ad8b5..ff421f69 100644
--- a/static/js/editor.js
+++ b/static/js/editor.js
@@ -46,7 +46,7 @@ pandora.ui.editor = function(data) {
                     autocomplete: layer.type == 'entity'
                         ? function(key, value, callback) {
                             pandora.api.autocompleteEntities({
-                                key: key,
+                                key: layer.entity,
                                 operator: '=',
                                 range: [0, 20],
                                 value: value