diff --git a/scripts/system/html/css/edit-style.css b/scripts/system/html/css/edit-style.css
index 6c1931932a..a56bed16da 100644
--- a/scripts/system/html/css/edit-style.css
+++ b/scripts/system/html/css/edit-style.css
@@ -1031,6 +1031,15 @@ textarea:enabled[scrolling="true"]::-webkit-resizer {
     position: relative; /* New positioning context. */
 }
 
+#footer-text {
+    float: right;
+    margin-right: 0;
+}
+
+#entity-list-footer {
+    padding-top: 38px;
+}
+
 #search-area {
     padding-right: 168px;
     padding-bottom: 24px;
diff --git a/scripts/system/html/entityList.html b/scripts/system/html/entityList.html
index 7eed78ecf3..cc7afe3bdb 100644
--- a/scripts/system/html/entityList.html
+++ b/scripts/system/html/entityList.html
@@ -1,4 +1,4 @@
-<!--
+<!--
 //  entityList.html
 //
 //  Created by Ryan Huffman on 19 Nov 2014
@@ -25,7 +25,6 @@
                 <input type="button" id="locked" class="glyph" value="&#xe006;" />
                 <input type="button" id="visible" class="glyph" value="&#xe007;" />
             </div>
-            <input type="button" id="export" value="Export Selection" />
             <input type="button" id="pal" class="glyph" value="&#xe00c;" />
             <input type="button" class="red" id="delete" value="Delete" />
         </div>
@@ -89,7 +88,7 @@
                     </tbody>
                     <tfoot>
                         <tr>
-                            <td id="footer-text" colspan="12"> </td>
+                            <td colspan="12"></td>
                         </tr>
                     </tfoot>
                 </table>
@@ -99,5 +98,13 @@
                 </div>
             </div>
         </div>
+        <div id="entity-list-footer">
+            <div>
+                <input type="button" id="export" value="Export Selection" />
+                <div id="footer-text">
+                    <b><span id="selected-entities-count">0</span> of <span id="visible-entities-count">0</span></b> selected
+                </div>
+            </div>
+        </div>
     </body>
 </html>
diff --git a/scripts/system/html/js/entityList.js b/scripts/system/html/js/entityList.js
index fed4dfb632..699277ca35 100644
--- a/scripts/system/html/js/entityList.js
+++ b/scripts/system/html/js/entityList.js
@@ -20,7 +20,7 @@ const IMAGE_MODEL_NAME = 'default-image-model.fbx';
 const COLLAPSE_EXTRA_INFO = "E";
 const EXPAND_EXTRA_INFO = "D";
 const FILTER_IN_VIEW_ATTRIBUTE = "pressed";
-const WINDOW_NONVARIABLE_HEIGHT = 207;
+const WINDOW_NONVARIABLE_HEIGHT = 257;
 const NUM_COLUMNS = 12;
 const EMPTY_ENTITY_ID = "0";
 const DELETE = 46; // Key code for the delete key.
@@ -60,7 +60,7 @@ const COMPARE_DESCENDING = function(a, b) {
 }
 
 // List of all entities
-var entities = []
+var entities = [];
 // List of all entities, indexed by Entity ID
 var entitiesByID = {};
 // The filtered and sorted list of entities passed to ListView
@@ -112,7 +112,8 @@ function loaded() {
         elPal = document.getElementById("pal");
         elInfoToggle = document.getElementById("info-toggle");
         elInfoToggleGlyph = elInfoToggle.firstChild;
-        elFooter = document.getElementById("footer-text");
+        elSelectedEntitiesCount = document.getElementById("selected-entities-count");
+        elVisibleEntitiesCount = document.getElementById("visible-entities-count");
         elNoEntitiesMessage = document.getElementById("no-entities");
         elNoEntitiesInView = document.getElementById("no-entities-in-view");
         elNoEntitiesRadius = document.getElementById("no-entities-radius");
@@ -440,15 +441,8 @@ function loaded() {
         }
         
         function refreshFooter() {
-            if (selectedEntities.length > 1) {
-                elFooter.firstChild.nodeValue = selectedEntities.length + " entities selected";
-            } else if (selectedEntities.length === 1) {
-                elFooter.firstChild.nodeValue = "1 entity selected";
-            } else if (visibleEntities.length === 1) {
-                elFooter.firstChild.nodeValue = "1 entity found";
-            } else {
-                elFooter.firstChild.nodeValue = visibleEntities.length + " entities found";
-            }
+            elSelectedEntitiesCount.innerText = selectedEntities.length;
+            elVisibleEntitiesCount.innerText = visibleEntities.length;
         }
         
         function refreshNoEntitiesMessage() {