diff --git a/src/octoprint/static/js/app/viewmodels/files.js b/src/octoprint/static/js/app/viewmodels/files.js
index e9024f56..20359a48 100644
--- a/src/octoprint/static/js/app/viewmodels/files.js
+++ b/src/octoprint/static/js/app/viewmodels/files.js
@@ -18,7 +18,6 @@ $(function() {
 
         self.searchQuery = ko.observable(undefined);
         self.searchQuery.subscribe(function() {
-			console.log("searhc update");
             self.performSearch();
         });
 
@@ -48,9 +47,10 @@ $(function() {
                     return 0;
                 },
                 "size": function(a, b) {
+					var k = 'size';
                     // sorts descending
-                    if (b["bytes"] === undefined || a["bytes"] > b["bytes"]) return -1;
-                    if (a["bytes"] < b["bytes"]) return 1;
+                    if (b[k] === undefined || a[k] > b[k]) return -1;
+                    if (a[k] < b[k]) return 1;
                     return 0;
                 }
             },
@@ -615,6 +615,6 @@ $(function() {
     OCTOPRINT_VIEWMODELS.push([
         GcodeFilesViewModel,
         ["printerStateViewModel", "loginStateViewModel", "slicingViewModel"],
-        ["#files_wrapper", "#files_search"]
+        ["#files_wrapper", "#files_search", "#files_filter"]
     ]);
 });
diff --git a/src/octoprint/templates/mrbeam_index.jinja2 b/src/octoprint/templates/mrbeam_index.jinja2
index c2c1b938..8d1d9d25 100644
--- a/src/octoprint/templates/mrbeam_index.jinja2
+++ b/src/octoprint/templates/mrbeam_index.jinja2
@@ -431,7 +431,7 @@
 											<input type="text" style="width:90%;" class="input-block search-query" data-bind="value: searchQuery, valueUpdate: 'input'" placeholder="{{ _('Search...') }}">
 										</form>
 									</div>
-									<ul class="file_list_filter">
+									<ul class="file_list_filter" id="files_filter">
 										<li><a href="#" data-bind="click: function() { $root.listHelper.changeSorting('name'); }"><i class="icon-ok" data-bind="style: {visibility: listHelper.currentSorting() == 'name' ? 'visible' : 'hidden'}"></i> {{ _('Sort by name') }} ({{ _('ascending') }})</a></li>
 										<li><a href="#" data-bind="click: function() { $root.listHelper.changeSorting('upload'); }"><i class="icon-ok" data-bind="style: {visibility: listHelper.currentSorting() == 'upload' ? 'visible' : 'hidden'}"></i> {{ _('Sort by upload date') }} ({{ _('descending') }})</a></li>
 										<li><a href="#" data-bind="click: function() { $root.listHelper.changeSorting('size'); }"><i class="icon-ok" data-bind="style: {visibility: listHelper.currentSorting() == 'size' ? 'visible' : 'hidden'}"></i> {{ _('Sort by file size') }} ({{ _('descending') }})</a></li>