diff --git a/static/js/editor.js b/static/js/editor.js
index ee40862a1..e585c114d 100644
--- a/static/js/editor.js
+++ b/static/js/editor.js
@@ -19,6 +19,7 @@ pandora.ui.editor = function(data) {
                 pandora.api.autocompleteEntities({
                     key: key,
                     operator: '=',
+                    range: [0, 20],
                     value: value
                 }, function(result) {
                     callback(result.data.items);
diff --git a/static/js/entityDialog.js b/static/js/entityDialog.js
index fe0b84875..cd2b40dbd 100644
--- a/static/js/entityDialog.js
+++ b/static/js/entityDialog.js
@@ -19,7 +19,8 @@ pandora.ui.entityDialog = function() {
                     click: function() {
                         var part = ui.part.entities;
                         that.close();
-                        ui.set({'part.entities': part});
+                        pandora.UI.set({'part.entities': part});
+                        // FIXME: Also set ui.entitiesType
                         pandora.$ui.entitiesDialog = pandora.ui.entitiesDialog().open();
                     }
                 }),