diff --git a/src/index.html b/src/index.html
index db16bc3af..da6bcc709 100644
--- a/src/index.html
+++ b/src/index.html
@@ -1082,7 +1082,7 @@ <h5 class="modal-title">Open</h5>
                     </form>
                   </th>
                   <th>
-                    Group:
+                    Group:<br>
                     <div class="btn-group" title="Filter files by group">
                       <button
                         style="max-width: 120px; overflow: hidden;"
@@ -1102,7 +1102,7 @@ <h5 class="modal-title">Open</h5>
                     </div>
                   </th>
                   <th>
-                    Owner:
+                    Owner:<br>
                     <div class="btn-group" title="Filter files by owner">
                       <button
                         style="max-width: 120px; overflow: hidden;"
diff --git a/src/js/views/files.js b/src/js/views/files.js
index d14a43677..371c0456f 100644
--- a/src/js/views/files.js
+++ b/src/js/views/files.js
@@ -256,6 +256,10 @@ export var FileListView = Backbone.View.extend({
             self.$tbody.prepend(e);
         });
         var owners = this.model.pluck("owner");
+        // Lookup owner by ID "before" filtering, in case the chosen owner is filtered out
+        let owner = owners.find(o => o.id == filter.owner);
+        let ownerName = owner ? `${owner.firstName} ${owner.lastName}`: "Show All";
+
         if (filter.group) {
             let ownerIds = this.model.models.filter(f => f.get('group').id == filter.group).map(f => f.get('owner').id);
             owners = owners.filter(o => ownerIds.includes(o.id));
@@ -284,8 +288,6 @@ export var FileListView = Backbone.View.extend({
                 </a></li>`;
         });
         $("#owner-menu").html(ownersHtml);
-        let owner = owners.find(o => o.id == filter.owner);
-        let ownerName = owner ? `${owner.firstName} ${owner.lastName}`: "Show All";
         $("#selected_owner").html(ownerName);
 
         // render groups chooser