diff --git a/src/components/Scripts.astro b/src/components/Scripts.astro
index cccfd81..0072d8f 100644
--- a/src/components/Scripts.astro
+++ b/src/components/Scripts.astro
@@ -83,18 +83,47 @@ import '../styles/sal.css';
 	}
 
 	function setSearchLink() {
+		const body = document.body;
 		const dialog = document.querySelector('dialog');
 		const openDialogLink = document.getElementById('search-link');
+		const closeDialogLink = document.getElementById('close-search');
+
+		dialog.addEventListener('close', () => {
+			body.style.overflow = 'auto';
+		});
 
 		openDialogLink?.addEventListener('click', (event) => {
+			const searchInput = dialog?.querySelector('input');
 			event.preventDefault();
 			dialog?.showModal();
+			searchInput?.focus();
+			body.style.overflow = 'hidden';
+		});
+
+		closeDialogLink?.addEventListener('click', (event) => {
+			event.preventDefault();
+			if (!dialog?.classList.contains('hide')) {
+				dialog?.classList.add('hide');
+				dialog?.addEventListener(
+					'animationend',
+					(animationEvent) => {
+						if (animationEvent.animationName === 'hide-modal') {
+							dialog?.close();
+							dialog?.classList.remove('hide');
+						}
+					},
+					{ once: true }
+				);
+			}
 		});
 
 		document.addEventListener('keydown', (event) => {
 			if (event.key === '/') {
+				const searchInput = dialog?.querySelector('input');
 				event.preventDefault();
 				dialog?.showModal();
+				searchInput?.focus();
+				body.style.overflow = 'hidden';
 			}
 		});
 	}
diff --git a/src/components/SearchLink.astro b/src/components/SearchLink.astro
index 0c89c2a..c9fd353 100644
--- a/src/components/SearchLink.astro
+++ b/src/components/SearchLink.astro
@@ -5,9 +5,9 @@ import { Link } from '.';
 ---
 
 <Link
-	class="col-span-2 col-start-1 h-clickarea w-clickarea items-center justify-center self-center justify-self-center transition-transform duration-500 ease-in-out hover:scale-75 focus:scale-75 print:hidden md:col-span-1"
+	class="col-span-2 col-start-1 h-clickarea w-clickarea scale-75 items-center justify-center self-center justify-self-center transition-transform duration-500 ease-in-out hover:scale-90 focus:scale-90 print:hidden md:col-span-1"
 	id="search-link"
-	title="Search (/)"
+	title="Search the website (/)"
 >
 	<button
 		aria-label="Search the website (/)"
diff --git a/src/components/SearchModal.astro b/src/components/SearchModal.astro
index 5582d68..41b5a1f 100644
--- a/src/components/SearchModal.astro
+++ b/src/components/SearchModal.astro
@@ -1,14 +1,35 @@
 ---
 import Search from 'astro-pagefind/components/Search';
+
+import { Sprite } from 'astro-icon';
+
+import { Link } from '.';
 ---
 
 <dialog>
-	<Search />
+	<header
+		class="flex h-[clamp(3rem,_5.55vw,_9rem)] w-full items-center justify-end pie-gap pis-gap block-start-0"
+	>
+		<Link
+			id="close-search"
+			class="transition-transform duration-500 ease-in-out block-start-0 hover:scale-125"
+		>
+			<button
+				aria-label="Close Search Modal"
+				class="flex h-[2em] w-[2em] cursor-pointer items-center justify-center text-shibui-950 dark:text-shibui-200/[0.87]"
+			>
+				<Sprite name="ri:close-line" class="h-[2em] w-[2em]" />
+			</button>
+		</Link>
+	</header>
+	<search>
+		<Search />
+	</search>
 </dialog>
 
 <style is:global>
 	dialog::backdrop {
-		@apply bg-black/50 backdrop-blur-sm;
+		@apply bg-shibui-100  dark:bg-shibui-900;
 		animation: show-dimmer 0.5s ease-in-out;
 	}
 
@@ -17,7 +38,7 @@ import Search from 'astro-pagefind/components/Search';
 	}
 
 	dialog[open] {
-		@apply h-[80vh] w-[80vw] max-w-[40em] bg-shibui-100 font-sans font-normal leading-relaxed text-shibui-950 common-ligatures dark:border-1 dark:border-solid dark:border-shibui-200/[0.25] dark:bg-shibui-900 dark:text-shibui-200/[0.87];
+		@apply m-gap w-[calc(100%_-_5.55vw_*_2)] bg-shibui-100 p-0 font-sans font-normal leading-relaxed text-shibui-950 common-ligatures dark:bg-shibui-900 dark:text-shibui-200/[0.87];
 		animation: show-modal 0.5s ease-in-out;
 	}
 
@@ -66,7 +87,7 @@ import Search from 'astro-pagefind/components/Search';
 	}
 
 	.pagefind-ui {
-		@apply bg-shibui-100 !font-sans !font-normal !leading-relaxed text-shibui-950 common-ligatures dark:bg-shibui-900 dark:text-shibui-200/[0.87];
+		@apply px-gap !font-sans !font-normal !leading-relaxed pbe-gap common-ligatures;
 	}
 
 	.pagefind-ui__form::before {
@@ -75,15 +96,23 @@ import Search from 'astro-pagefind/components/Search';
 
 	.pagefind-ui__search-input,
 	.pagefind-ui__search-clear {
-		@apply !bg-shibui-100 !text-shibui-950 dark:!bg-shibui-850 dark:!text-shibui-200/[0.87];
+		@apply !text-shibui-950 dark:!text-shibui-100;
 	}
 
 	.pagefind-ui__search-input {
-		@apply !border-1 !border-solid !border-shibui-900/[0.25] !bg-shibui-100 !text-shibui-950 !pis-7 dark:!border-shibui-200/[0.25] dark:!bg-shibui-850 dark:!text-shibui-200/[0.87];
+		@apply !h-[clamp(3.3rem,_7.3vw,_8.5rem)] !border-0 !border-solid !border-black/[0.1] !bg-transparent !text-7 !font-black !leading-tight !pis-0 !border-be-2 !border-bs-0 !border-ie-0 !border-is-0 dark:!border-white/[0.1] dark:!font-extrabold;
+	}
+
+	.pagefind-ui__search-input::placeholder {
+		@apply !text-shibui-950 !opacity-20 dark:!text-shibui-200/[0.87] dark:!opacity-30;
 	}
 
 	.pagefind-ui__search-clear {
-		@apply !inline-end-4;
+		@apply !h-[clamp(3.3rem,_7.3vw,_8.5rem)] !rounded-sm !bg-transparent !p-2 focus:!outline;
+	}
+
+	.pagefind-ui__results {
+		@apply !grid-cols-[repeat(auto-fill,_minmax(400px,_1fr))] !gap-x-gap !pbe-12 lg:!grid;
 	}
 
 	.pagefind-ui__result {
@@ -97,7 +126,7 @@ import Search from 'astro-pagefind/components/Search';
 	}
 
 	.pagefind-ui__result-link {
-		@apply inline !font-semibold !text-shibui-950 underline !decoration-shibui-900/20 !decoration-4 underline-offset-auto no-common-ligatures hover:!decoration-accent focus:!decoration-accent dark:!text-shibui-100;
+		@apply inline !font-semibold !text-shibui-950 !underline !decoration-shibui-900/20 !decoration-4 underline-offset-auto no-common-ligatures hover:!decoration-accent focus:!decoration-accent dark:!text-shibui-100;
 	}
 
 	.pagefind-ui .pagefind-ui__result-link {
@@ -113,6 +142,6 @@ import Search from 'astro-pagefind/components/Search';
 	}
 
 	.pagefind-ui__button {
-		@apply !border-1 !border-solid !border-shibui-900/[0.25] !bg-shibui-200 !text-shibui-950 hover:!bg-shibui-300 dark:!border-shibui-200/[0.25] dark:!bg-shibui-950 dark:!text-shibui-200/[0.87] dark:hover:!bg-shibui-800;
+		@apply !flex !items-center !justify-center !border-0 !bg-transparent !py-12 !text-4 !tracking-tight !text-shibui-950 !mbe-10 !mbs-0 focus:!outline dark:!text-shibui-200/[0.87];
 	}
 </style>