diff --git a/templates/_search.html b/templates/_search.html
index 69ca25af..b6baf37c 100644
--- a/templates/_search.html
+++ b/templates/_search.html
@@ -38,6 +38,7 @@
     <option value="torrent_name" {{if eq .Search.Sort "torrent_name"}}selected{{end}}>Name</option>
     <option value="date" {{if eq .Search.Sort "date"}}selected{{end}}>Date</option>
     <option value="downloads" {{if eq .Search.Sort "downloads"}}selected{{end}}>Downloads</option>
+    <option value="filesize" {{if eq .Search.Sort "filesize"}}selected{{end}}>Size</option>
   </select>
   <select name="order" class="form-control input-sm">
     <option value="desc" {{if eq .Search.Order "desc"}}selected{{end}}>Descending</option>
diff --git a/util/format.go b/util/format.go
index fb2cbb1d..18427e83 100644
--- a/util/format.go
+++ b/util/format.go
@@ -7,7 +7,10 @@ import (
 func FormatFilesize(bytes int64) string {
     var unit string
     var value float64
-    if bytes > 1024*1024*1024 {
+    if bytes > 1024*1024*1024*1024 {
+        unit = "TiB"
+        value = float64(bytes) / (1024*1024*1024*1024)
+    } else if bytes > 1024*1024*1024 {
         unit = "GiB"
         value = float64(bytes) / (1024*1024*1024)
     } else if bytes > 1024*1024 {