diff --git a/site/src/components/SearchResult.svelte b/site/src/components/SearchResult.svelte
new file mode 100644
index 0000000000..7cdb0a5e26
--- /dev/null
+++ b/site/src/components/SearchResult.svelte
@@ -0,0 +1,50 @@
+<script>
+	import { createEventDispatcher } from 'svelte';
+
+	const dispatch = createEventDispatcher();
+
+	export let title;
+	export let slug;
+	export let query;
+
+	function highlightQuery(text, query) {
+		return text.replace(query, `<span class="site-search-highlight">${query}</span>`)
+			.replace(/</g, `&lt;`)
+			.replace(/>/g, `&gt;`)
+			.replace(/&lt;span class="site-search-highlight"&gt;/g, `<span class="site-search-highlight">`)
+			.replace(/&lt;\/span&gt;/g, `</span>`);
+	}
+</script>
+
+<svelte:head>
+	<style>
+		.site-search-highlight {
+			background: rgba(0, 0, 0, 0.3);
+		}
+	</style>
+</svelte:head>
+
+<a href="/docs#{slug}" on:click={()=> dispatch('navigate')}>
+	<div class="result">
+		<div class="inner">
+			{@html highlightQuery(title, query)}
+		</div>
+	</div>
+</a>
+
+<style>
+	.result {
+		padding: 6px 12px;
+		color: var(--text);
+		transition: opacity 300ms;
+		opacity: 0.8;
+	}
+	.result:hover {
+		opacity: 1;
+	}
+	.inner {
+		border-radius: var(--border-r);
+		border: calc(var(--border-w) / 2) solid var(--second);
+		padding: 8px;
+	}
+</style>
diff --git a/site/src/components/SiteSearch.svelte b/site/src/components/SiteSearch.svelte
index 94b58a15c8..a92ae4d543 100644
--- a/site/src/components/SiteSearch.svelte
+++ b/site/src/components/SiteSearch.svelte
@@ -45,6 +45,7 @@
 	import { writable } from 'svelte/store';
 	import { fade, fly} from 'svelte/transition';
 	import SearchBar from './SearchBar.svelte';
+	import SearchResult from './SearchResult.svelte';
 	import { onMount } from 'svelte';
 
 	export let showing = false;
@@ -86,11 +87,16 @@
 	<div class="cover search" transition:fly={{x: 400}}>
 		<SearchBar bind:query on:close={() => showing = false} />
 		<div class="divider" />
-		{#if results.length}
-			reuslts
+		{#each results as result}
+			<SearchResult
+				title={result.bareTitle}
+				slug={result.slug}
+				{query}
+				on:navigate={() => showing = false}
+			/>
 		{:else}
 			<img src="/icons/svelte-search.svg" alt="Search Icon">
-		{/if}
+		{/each}
 
 		{#if loading}
 			<p class="message">Loading...</p>