diff --git a/frontend/src/lib/components/ContentSearch.svelte b/frontend/src/lib/components/ContentSearch.svelte
index 0c717b64fe..659f833f1c 100644
--- a/frontend/src/lib/components/ContentSearch.svelte
+++ b/frontend/src/lib/components/ContentSearch.svelte
@@ -109,7 +109,7 @@
 	filter={search}
 	items={scripts}
 	f={(s) => {
-		return s.content
+		return escape(s.content)
 	}}
 	bind:filteredItems={filteredScriptItems}
 />
@@ -118,7 +118,7 @@
 	filter={search}
 	items={resources}
 	f={(s) => {
-		return YAML.stringify(s.value)
+		return escape(YAML.stringify(s.value))
 	}}
 	bind:filteredItems={filteredResourceItems}
 />
@@ -127,7 +127,7 @@
 	filter={search}
 	items={flows}
 	f={(s) => {
-		return YAML.stringify(s.value, null, 4)
+		return escape(YAML.stringify(s.value, null, 4))
 	}}
 	bind:filteredItems={filteredFlowItems}
 />
@@ -277,7 +277,7 @@
 							<div class="py-1" />
 						{/if}
 
-						{#if search.length > 0}
+						{#if search.trim().length > 0}
 							<div class="flex flex-col gap-4">
 								{#if (searchKind == 'all' || searchKind == 'scripts') && filteredScriptItems?.length > 0}
 									{#each filteredScriptItems ?? [] as item}
diff --git a/frontend/src/lib/components/SearchItems.svelte b/frontend/src/lib/components/SearchItems.svelte
index 0423608e08..f99dbccb76 100644
--- a/frontend/src/lib/components/SearchItems.svelte
+++ b/frontend/src/lib/components/SearchItems.svelte
@@ -13,15 +13,16 @@
 	$: plaintextItems && filter != undefined && setTimeout(() => filterItems(), 0)
 
 	function filterItems() {
-		if (items == undefined || filter.length == 0) {
+		let trimmed = filter.trim()
+		if (items == undefined || trimmed.length == 0) {
 			filteredItems = items
 			return
 		}
 		// pre-filter
-		let idxs = uf.filter(plaintextItems, filter) ?? []
+		let idxs = uf.filter(plaintextItems, trimmed) ?? []
 
-		let info = uf.info(idxs, plaintextItems, filter)
-		let order = uf.sort(info, plaintextItems, filter)
+		let info = uf.info(idxs, plaintextItems, trimmed)
+		let order = uf.sort(info, plaintextItems, trimmed)
 
 		let result: any[] = []