diff --git a/scripts/system/html/js/entityList.js b/scripts/system/html/js/entityList.js
index 21132fa968..615a3c8ddb 100644
--- a/scripts/system/html/js/entityList.js
+++ b/scripts/system/html/js/entityList.js
@@ -137,7 +137,7 @@ function loaded() {
                 let clickedItemFound = -1;
                 for (let i = 0, len = visibleEntities.length; i < len; ++i) {
                     let entity = visibleEntities[i];
-                    if (clickedItemFound === -1 && entityID == entity.id) {
+                    if (clickedItemFound === -1 && entityID === entity.id) {
                         clickedItemFound = i;
                     } else if (previousItemFound === -1 && selectedEntities[0] === entity.id) {
                         previousItemFound = i;
@@ -201,10 +201,6 @@ function loaded() {
             return urlParts[urlParts.length - 1];
         }
 
-        elFilter.onkeyup = refreshEntityList;
-        elFilter.onpaste = refreshEntityList;
-        elFilter.onchange = refreshEntityList;
-
         // Update the entity list with the new set of data sent from edit.js
         function updateEntityList(entityData) {
             const IMAGE_MODEL_NAME = 'default-image-model.fbx';
@@ -482,7 +478,7 @@ function loaded() {
                 } else if (data.type === "update" && data.selectedIDs !== undefined) {
                     PROFILE("update", function() {
                         var newEntities = data.entities;
-                        if (newEntities && newEntities.length == 0) {
+                        if (newEntities && newEntities.length === 0) {
                             elNoEntitiesMessage.style.display = "block";
                             elFooter.firstChild.nodeValue = "0 entities found";
                         } else if (newEntities) {
@@ -540,7 +536,13 @@ function loaded() {
         };
 
         window.onresize = resize;
-        elFilter.onchange = resize;
+
+        elFilter.onkeyup = refreshEntityList;
+        elFilter.onpaste = refreshEntityList;
+        elFilter.onchange = function() {
+            refreshEntityList();
+            resize();
+        };
         elFilter.onblur = refreshFooter;
 
 
diff --git a/scripts/system/libraries/entityList.js b/scripts/system/libraries/entityList.js
index b53bbbd372..27e079589b 100644
--- a/scripts/system/libraries/entityList.js
+++ b/scripts/system/libraries/entityList.js
@@ -142,49 +142,49 @@ EntityListTool = function(shouldUseEditTabletApp) {
 
             var ids;
             PROFILE("findEntities", function() {
-            if (filterInView) {
-                ids = Entities.findEntitiesInFrustum(Camera.frustum);
-            } else {
-                ids = Entities.findEntities(MyAvatar.position, searchRadius);
-            }
+                if (filterInView) {
+                    ids = Entities.findEntitiesInFrustum(Camera.frustum);
+                } else {
+                    ids = Entities.findEntities(MyAvatar.position, searchRadius);
+                }
             });
 
             var cameraPosition = Camera.position;
             PROFILE("getProperties", function() {
-            for (var i = 0; i < ids.length; i++) {
-                var id = ids[i];
-                var properties = Entities.getEntityProperties(id, ['name', 'type', 'locked',
-                    'visible', 'renderInfo', 'type', 'modelURL', 'materialURL', 'script']);
+                for (var i = 0; i < ids.length; i++) {
+                    var id = ids[i];
+                    var properties = Entities.getEntityProperties(id, ['name', 'type', 'locked',
+                        'visible', 'renderInfo', 'type', 'modelURL', 'materialURL', 'script']);
 
-                if (!filterInView || Vec3.distance(properties.position, cameraPosition) <= searchRadius) {
-                    var url = "";
-                    if (properties.type === "Model") {
-                        url = properties.modelURL;
-                    } else if (properties.type === "Material") {
-                        url = properties.materialURL;
+                    if (!filterInView || Vec3.distance(properties.position, cameraPosition) <= searchRadius) {
+                        var url = "";
+                        if (properties.type === "Model") {
+                            url = properties.modelURL;
+                        } else if (properties.type === "Material") {
+                            url = properties.materialURL;
+                        }
+                        entities.push({
+                            id: id,
+                            name: properties.name,
+                            type: properties.type,
+                            url: url,
+                            locked: properties.locked,
+                            visible: properties.visible,
+                            verticesCount: (properties.renderInfo !== undefined ?
+                                valueIfDefined(properties.renderInfo.verticesCount) : ""),
+                            texturesCount: (properties.renderInfo !== undefined ?
+                                valueIfDefined(properties.renderInfo.texturesCount) : ""),
+                            texturesSize: (properties.renderInfo !== undefined ?
+                                valueIfDefined(properties.renderInfo.texturesSize) : ""),
+                            hasTransparent: (properties.renderInfo !== undefined ?
+                                valueIfDefined(properties.renderInfo.hasTransparent) : ""),
+                            isBaked: properties.type === "Model" ? url.toLowerCase().endsWith(".baked.fbx") : false,
+                            drawCalls: (properties.renderInfo !== undefined ?
+                                valueIfDefined(properties.renderInfo.drawCalls) : ""),
+                            hasScript: properties.script !== ""
+                        });
                     }
-                    entities.push({
-                        id: id,
-                        name: properties.name,
-                        type: properties.type,
-                        url: url,
-                        locked: properties.locked,
-                        visible: properties.visible,
-                        verticesCount: (properties.renderInfo !== undefined ?
-                            valueIfDefined(properties.renderInfo.verticesCount) : ""),
-                        texturesCount: (properties.renderInfo !== undefined ?
-                            valueIfDefined(properties.renderInfo.texturesCount) : ""),
-                        texturesSize: (properties.renderInfo !== undefined ?
-                            valueIfDefined(properties.renderInfo.texturesSize) : ""),
-                        hasTransparent: (properties.renderInfo !== undefined ?
-                            valueIfDefined(properties.renderInfo.hasTransparent) : ""),
-                        isBaked: properties.type === "Model" ? url.toLowerCase().endsWith(".baked.fbx") : false,
-                        drawCalls: (properties.renderInfo !== undefined ?
-                            valueIfDefined(properties.renderInfo.drawCalls) : ""),
-                        hasScript: properties.script !== ""
-                    });
                 }
-            }
             });
 
             var selectedIDs = [];