diff --git a/svelte/src/filesystem/filemanager/FileManager.svelte b/svelte/src/filesystem/filemanager/FileManager.svelte
index d727a18..cfa6601 100644
--- a/svelte/src/filesystem/filemanager/FileManager.svelte
+++ b/svelte/src/filesystem/filemanager/FileManager.svelte
@@ -260,10 +260,7 @@ onMount(() => {
 >
 	<div class="width_container">
 		{#if mode === "viewing"}
-			<!-- Search only works in the user's home directory -->
-			{#if $nav.path[0] && $nav.path[0].id === "me"}
-				<SearchBar nav={nav}/>
-			{/if}
+			<SearchBar nav={nav}/>
 
 			<div class="toolbar">
 				<button on:click={navigate_back} title="Back">
diff --git a/svelte/src/filesystem/filemanager/SearchBar.svelte b/svelte/src/filesystem/filemanager/SearchBar.svelte
index 4f08115..18783dc 100644
--- a/svelte/src/filesystem/filemanager/SearchBar.svelte
+++ b/svelte/src/filesystem/filemanager/SearchBar.svelte
@@ -97,7 +97,6 @@ const input_keydown = e => {
 const input_keyup = e => {
 	if (e.key === "Escape") {
 		clear_search(true)
-		e.preventDefault()
 	} else if (e.key === "ArrowUp") {
 		if (selected_result > 0) {
 			selected_result--
@@ -170,6 +169,12 @@ const window_keydown = (e) => {
 			on:keydown={input_keydown}
 			on:keyup={input_keyup}
 		/>
+		{#if search_term !== ""}
+			<!-- Button needs to be of button type in order to not submit the form -->
+			<button on:click={clear_search} type="button">
+				<i class="icon">close</i>
+			</button>
+		{/if}
 	</form>
 
 	<div class="results">