diff --git a/res/include/script/file_manager/DirectoryElement.js b/res/include/script/file_manager/DirectoryElement.js
index 4da9c0e..d808299 100644
--- a/res/include/script/file_manager/DirectoryElement.js
+++ b/res/include/script/file_manager/DirectoryElement.js
@@ -97,6 +97,7 @@ DirectoryElement.prototype.search = function(term) {
 		for (let i in this.allFiles) {
 			this.visibleFiles.push(i)
 		}
+		this.sortBy("")
 		this.renderVisibleFiles(true)
 		return
 	}
@@ -107,7 +108,6 @@ DirectoryElement.prototype.search = function(term) {
 		}
 	}
 
-	// We have to resort because we modified the visibleFiles array
 	this.sortBy("")
 	this.renderVisibleFiles(true)
 }
diff --git a/res/include/script/file_manager/FileManager.js b/res/include/script/file_manager/FileManager.js
index 5c0eaf3..dd981cd 100644
--- a/res/include/script/file_manager/FileManager.js
+++ b/res/include/script/file_manager/FileManager.js
@@ -10,9 +10,6 @@ function FileManager(windowElement) {
 	this.btnReload        = this.navBar.querySelector("#btn_reload")
 	this.inputSearch      = this.navBar.querySelector("#input_search")
 
-	// Buttons
-	this.btnReload.addEventListener("click", () => { this.getUserFiles() })
-
 	// Register keyboard shortcuts
 	document.addEventListener("keydown", e => { this.keyboardEvent(e) })
 
@@ -93,42 +90,30 @@ FileManager.prototype.getUserFiles = function() {
 
 FileManager.prototype.getUserLists = function() {
 	this.setSpinner()
-
-	let getAll = (page) => {
-		let numFiles = 1000
-		fetch(apiEndpoint+"/user/lists?page="+page+"&limit="+numFiles).then(resp => {
-			if (!resp.ok) { Promise.reject("yo") }
-			return resp.json()
-		}).then(resp => {
-			for (let i in resp.lists) {
-				this.directoryElement.addFile(
-					apiEndpoint+"/list/"+resp.lists[i].id+"/thumbnail?width=32&height=32",
-					resp.lists[i].title,
-					"/l/"+resp.lists[i].id,
-					"list",
-					resp.lists[i].file_count,
-					resp.lists[i].file_count+" files",
-					resp.lists[i].date_created,
-				)
-			}
-
-			this.directoryElement.renderFiles()
-
-			if (resp.lists.length === numFiles) {
-				getAll(page+1)
-			} else {
-				// Less than the maximum number of results means we're done
-				// loading, we can remove the loading spinner
-				this.delSpinner()
-			}
-		}).catch((err) => {
-			this.delSpinner()
-			throw(err)
-		})
-	}
-
 	this.directoryElement.reset()
-	getAll(0)
+
+	fetch(apiEndpoint+"/user/lists").then(resp => {
+		if (!resp.ok) { Promise.reject("yo") }
+		return resp.json()
+	}).then(resp => {
+		for (let i in resp.lists) {
+			this.directoryElement.addFile(
+				apiEndpoint+"/list/"+resp.lists[i].id+"/thumbnail?width=32&height=32",
+				resp.lists[i].title,
+				"/l/"+resp.lists[i].id,
+				"list",
+				resp.lists[i].file_count,
+				resp.lists[i].file_count+" files",
+				resp.lists[i].date_created,
+			)
+		}
+
+		this.directoryElement.renderFiles()
+		this.delSpinner()
+	}).catch((err) => {
+		this.delSpinner()
+		throw(err)
+	})
 }
 
 FileManager.prototype.keyboardEvent = function(e) {
diff --git a/res/template/account/file_manager.html b/res/template/account/file_manager.html
index 79f6231..d3ed195 100644
--- a/res/template/account/file_manager.html
+++ b/res/template/account/file_manager.html
@@ -63,6 +63,7 @@
 
 				hashChange()
 
+				document.getElementById("btn_reload").addEventListener("click", hashChange)
 				window.addEventListener("hashchange", hashChange)
 			})
 		</script>