diff --git a/src/lib/head/Busqueda.svelte b/src/lib/head/Busqueda.svelte
index f966680..3a6134d 100644
--- a/src/lib/head/Busqueda.svelte
+++ b/src/lib/head/Busqueda.svelte
@@ -18,12 +18,12 @@
 	import AvatarImage from '@/components/ui/avatar/avatar-image.svelte';
 	import Label from '@/components/ui/label/label.svelte';
 	import { resolve } from '$app/paths';
+	import { busquedaHashtags } from '@/hooks/busquedaHashtags';
 
 	let search: string = $state('');
 	let open = $state(false);
 
-	let usuarios: UserResponseDto[] = $state([]);
-	let loading = $state(false);
+	let usuarios: Promise<UserResponseDto[]> | undefined = $state();
 
 	let hashtags: Promise<any[]> | undefined = $state();
 
@@ -33,18 +33,17 @@
 			open = !open;
 		}
 	}
-	$inspect(usuarios, loading);
+	// $inspect(usuarios, loading);
 
 	let timeoutId: number | undefined;
 	function buscar() {
-		loading = true;
 		if (timeoutId) {
 			clearTimeout(timeoutId);
 		}
 
 		timeoutId = setTimeout(async () => {
-			usuarios = await busquedaUsuarios(search);
-			loading = false;
+			usuarios = busquedaUsuarios(search);
+			hashtags = busquedaHashtags(search);
 		}, 200);
 
 		return () => {
@@ -55,13 +54,14 @@
 
 <svelte:document onkeydown={handleKeydown} />
 
-<InputGroup>
+<InputGroup class="group">
 	<InputGroupAddon align="inline-start"><Search /></InputGroupAddon>
 	<InputGroupInput
 		type="text"
 		placeholder="Buscar Usuario o Hashtag"
 		bind:value={search}
 		oninput={() => (open = true)}
+		class="max-w-0 transition-[max-width] duration-1000 ease-out group-hover:max-w-xs focus:max-w-xs"
 	/>
 	<InputGroupAddon align="inline-end" class="flex gap-0">
 		<Kbd>Ctrl</Kbd>+<Kbd>K</Kbd>
@@ -75,36 +75,50 @@
 		oninput={buscar}
 	/>
 	{#if search}
-		<ul class="space-y-2">
+		<ul class="m-2 space-y-2">
 			<Label class="ms-3 text-sm font-medium text-muted-foreground">Usuarios</Label>
-			{#each usuarios as usuario}
-				<li class=" w-full cursor-pointer rounded-md hover:bg-accent">
-					<a
-						href={resolve('/[perfil]', { perfil: usuario.username })}
-						class="flex items-center gap-2 px-3 py-2"
-					>
-						{#if usuario.imageUrl}
-							<img src={usuario.imageUrl} alt={usuario.username} class="h-5 w-5 rounded-full" />
-						{:else}
-							<User class="h-5 w-5" />
-						{/if}
-						<span>{usuario.username}</span>
-					</a>
+			{#await usuarios}
+				<li>
+					<Spinner class="ms-2" />
 				</li>
-			{/each}
-
+			{:then usuariosr}
+				{#if usuariosr?.length == 0}
+					<li><p class="ms-2 text-sm">No se encontraron Usuarios</p></li>
+				{/if}
+				{#each usuariosr as usuario}
+					<li class=" w-full cursor-pointer rounded-md hover:bg-accent">
+						<a
+							href={resolve('/[perfil]', { perfil: usuario.username })}
+							class="flex items-center gap-2 px-3 py-2"
+						>
+							{#if usuario.imageUrl}
+								<img src={usuario.imageUrl} alt={usuario.username} class="h-5 w-5 rounded-full" />
+							{:else}
+								<User class="h-5 w-5" />
+							{/if}
+							<span>{usuario.username}</span>
+						</a>
+					</li>
+				{/each}
+			{/await}
 			<Label class="ms-3 text-sm font-medium text-muted-foreground">Hashtag</Label>
 			{#await hashtags}
-				<li class="flex items-center gap-2 px-3 py-2 text-muted-foreground">
-					<Spinner class="h-5 w-5" />
-					<span>Cargando …</span>
+				<li>
+					<Spinner class="ms-2" />
 				</li>
 			{:then hashtagsResult}
-				{#each hashtagsResult as hashtag}
-					<li class="flex cursor-pointer items-center gap-2 rounded-md px-3 py-2 hover:bg-accent">
-						<Hash class="h-5 w-5" />
-						<span>{hashtag.name}</span>
+				{#if hashtagsResult?.length == 0}
+					<li>
+						<p class="ms-2 text-sm">No se encontraron Hashtags</p>
 					</li>
+				{/if}
+				{#each hashtagsResult as hashtag}
+					<a href={resolve('/htag/[htag]', { htag: hashtag })}>
+						<li class="flex cursor-pointer items-center gap-2 rounded-md px-3 py-2 hover:bg-accent">
+							<Hash class="h-5 w-5" />
+							<span>{hashtag}</span>
+						</li>
+					</a>
 				{/each}
 			{/await}
 		</ul>
diff --git a/src/lib/hooks/busquedaHashtags.ts b/src/lib/hooks/busquedaHashtags.ts
new file mode 100644
index 0000000..e45413e
--- /dev/null
+++ b/src/lib/hooks/busquedaHashtags.ts
@@ -0,0 +1,18 @@
+import { apiBase } from '@/stores/url';
+import { get } from 'svelte/store';
+
+export async function busquedaHashtags(htag: string) {
+	if (!htag) return null;
+	try {
+		const req = await fetch(`${get(apiBase)}/api/htag?q=${htag}`, {
+			method: 'GET'
+		});
+		if (req.ok) {
+			let data = await req.json();
+			return data;
+		}
+		return [];
+	} catch {
+		return null;
+	}
+}