diff --git a/web/src/lib/components/album-page/album-card.svelte b/web/src/lib/components/album-page/album-card.svelte
index 5900abb030..17ec886761 100644
--- a/web/src/lib/components/album-page/album-card.svelte
+++ b/web/src/lib/components/album-page/album-card.svelte
@@ -10,6 +10,8 @@
 	export let album: AlbumResponseDto;
 	export let isSharingView = false;
 	export let user: UserResponseDto;
+	export let showItemCount = true;
+	export let showContextMenu = true;
 
 	$: imageData = album.albumThumbnailAssetId
 		? api.getAssetThumbnailUrl(album.albumThumbnailAssetId, ThumbnailFormat.Webp)
@@ -63,7 +65,7 @@
 	data-testid="album-card"
 >
 	<!-- svelte-ignore a11y-click-events-have-key-events -->
-	{#if !isSharingView}
+	{#if showContextMenu}
 		<div
 			id={`icon-${album.id}`}
 			class="absolute top-6 right-6 z-10"
@@ -101,10 +103,12 @@
 		</p>
 
 		<span class="text-sm flex gap-2 dark:text-immich-dark-fg" data-testid="album-details">
-			<p>
-				{album.assetCount.toLocaleString($locale)}
-				{album.assetCount == 1 ? `item` : `items`}
-			</p>
+			{#if showItemCount}
+				<p>
+					{album.assetCount.toLocaleString($locale)}
+					{album.assetCount == 1 ? `item` : `items`}
+				</p>
+			{/if}
 
 			{#if isSharingView || album.shared}
 				<p>·</p>
diff --git a/web/src/lib/components/album-page/album-viewer.svelte b/web/src/lib/components/album-page/album-viewer.svelte
index aa4091e03e..2223fcbd2e 100644
--- a/web/src/lib/components/album-page/album-viewer.svelte
+++ b/web/src/lib/components/album-page/album-viewer.svelte
@@ -89,6 +89,10 @@
 		if (from?.url.pathname === '/sharing' && album.sharedUsers.length === 0) {
 			isCreatingSharedAlbum = true;
 		}
+
+		if (from?.route.id === '/(user)/search') {
+			backUrl = from.url.href;
+		}
 	});
 
 	const albumDateFormat: Intl.DateTimeFormatOptions = {
diff --git a/web/src/lib/components/shared-components/search-bar/search-bar.svelte b/web/src/lib/components/shared-components/search-bar/search-bar.svelte
index 61e6c3e627..8726da558a 100644
--- a/web/src/lib/components/shared-components/search-bar/search-bar.svelte
+++ b/web/src/lib/components/shared-components/search-bar/search-bar.svelte
@@ -94,7 +94,7 @@
 			<div class="px-5 pt-5 text-xs">
 				<p>
 					Smart search is enabled by default, to search for metadata use the syntax <span
-						class="font-mono p-2 font-semibold text-immich-primary dark:text-immich-dark-primary bg-gray-100 rounded-lg dark:bg-gray-900"
+						class="font-mono p-2 font-semibold text-immich-primary dark:text-immich-dark-primary bg-gray-100 rounded-lg dark:bg-gray-900 leading-7"
 						>m:your-search-term</span
 					>
 				</p>
diff --git a/web/src/routes/(user)/search/+page.svelte b/web/src/routes/(user)/search/+page.svelte
index 0a7b699bfc..ce7585d715 100644
--- a/web/src/routes/(user)/search/+page.svelte
+++ b/web/src/routes/(user)/search/+page.svelte
@@ -20,19 +20,27 @@
 	import type { PageData } from './$types';
 	import SelectAll from 'svelte-material-icons/SelectAll.svelte';
 	import CircleIconButton from '$lib/components/elements/buttons/circle-icon-button.svelte';
+	import { AppRoute } from '$lib/constants';
+	import AlbumCard from '$lib/components/album-page/album-card.svelte';
+	import { flip } from 'svelte/animate';
 
 	export let data: PageData;
 
 	// The GalleryViewer pushes it's own history state, which causes weird
 	// behavior for history.back(). To prevent that we store the previous page
 	// manually and navigate back to that.
-	let previousRoute = '/explore';
+	let previousRoute = AppRoute.EXPLORE as string;
+	$: albums = data.results.albums.items;
 
 	afterNavigate(({ from }) => {
 		// Prevent setting previousRoute to the current page.
 		if (from && from.route.id !== $page.route.id) {
 			previousRoute = from.url.href;
 		}
+
+		if (from?.route.id === '/(user)/albums/[albumId]') {
+			previousRoute = AppRoute.EXPLORE;
+		}
 	});
 
 	$: term = $page.url.searchParams.get('q') || data.term || '';
@@ -79,6 +87,30 @@
 
 <section class="relative pt-32 mb-12 bg-immich-bg dark:bg-immich-dark-bg">
 	<section class="overflow-y-auto relative immich-scrollbar">
+		{#if albums.length}
+			<section>
+				<div class="text-4xl font-medium text-black/70 dark:text-white/80 ml-6">ALBUMS</div>
+				<div class="grid grid-cols-[repeat(auto-fill,minmax(15rem,1fr))]">
+					{#each albums as album (album.id)}
+						<a
+							data-sveltekit-preload-data="hover"
+							href={`albums/${album.id}`}
+							animate:flip={{ duration: 200 }}
+						>
+							<AlbumCard
+								{album}
+								user={data.user}
+								isSharingView={false}
+								showItemCount={false}
+								showContextMenu={false}
+							/>
+						</a>
+					{/each}
+				</div>
+
+				<div class="m-6 text-4xl font-medium text-black/70 dark:text-white/80">PHOTOS & VIDEOS</div>
+			</section>
+		{/if}
 		<section id="search-content" class="relative bg-immich-bg dark:bg-immich-dark-bg">
 			{#if data.results?.assets?.items.length > 0}
 				<div class="pl-4">
diff --git a/web/src/routes/(user)/sharing/+page.svelte b/web/src/routes/(user)/sharing/+page.svelte
index b783d6594f..a2327d271c 100644
--- a/web/src/routes/(user)/sharing/+page.svelte
+++ b/web/src/routes/(user)/sharing/+page.svelte
@@ -100,7 +100,7 @@
 							href={`albums/${album.id}`}
 							animate:flip={{ duration: 200 }}
 						>
-							<AlbumCard {album} user={data.user} isSharingView />
+							<AlbumCard {album} user={data.user} isSharingView showContextMenu={false} />
 						</a>
 					{/each}
 				</div>