diff --git a/src/routes/communities/+page.svelte b/src/routes/communities/+page.svelte
index 7d7bc635..d500cba4 100644
--- a/src/routes/communities/+page.svelte
+++ b/src/routes/communities/+page.svelte
@@ -8,6 +8,7 @@
     GlobeAmericas,
     Icon,
     InformationCircle,
+    MagnifyingGlass,
     PencilSquare,
     Plus,
     QuestionMarkCircle,
@@ -87,8 +88,21 @@
     on:submit|preventDefault={() => searchParam($page.url, 'q', search, 'page')}
     class="flex flex-col sm:flex-row gap-2 sm:ml-auto items-center"
   >
-    <TextInput bind:value={search} />
-    <Button submit color="ghost" class="h-max">Search</Button>
+    <TextInput
+      bind:value={search}
+      placeholder="Search for a community..."
+      label="Query"
+      size="sm"
+    />
+    <Button
+      submit
+      color="ghost"
+      size="square-md"
+      class="self-end"
+      aria-label="Search"
+    >
+      <Icon src={MagnifyingGlass} size="16" mini />
+    </Button>
   </form>
 </div>
 <ul class="flex flex-col divide-y dark:divide-zinc-800">
diff --git a/src/routes/search/+page.svelte b/src/routes/search/+page.svelte
index 08e9bb6b..3139de4c 100644
--- a/src/routes/search/+page.svelte
+++ b/src/routes/search/+page.svelte
@@ -22,10 +22,11 @@
     PersonView,
     PostView,
   } from 'lemmy-js-client'
-  import { Button, Select, Spinner, TextInput } from 'mono-svelte'
+  import { Button, Disclosure, Select, Spinner, TextInput } from 'mono-svelte'
   import {
     AdjustmentsHorizontal,
     Bars3BottomRight,
+    ChevronDown,
     Icon,
     MagnifyingGlass,
   } from 'svelte-hero-icons'
@@ -39,6 +40,8 @@
   let query = data.query || ''
 
   let pageNum = data.page
+
+  let moreOptions = false
 </script>
 
 <svelte:head>
@@ -46,7 +49,7 @@
 </svelte:head>
 
 <h1 class="font-bold text-3xl">Search</h1>
-<div class="flex flex-row flex-wrap sm:justify-between items-center gap-4 mt-4">
+<div class="flex flex-row flex-wrap items-center gap-4 mt-4">
   <Select
     bind:value={data.type}
     on:change={() => searchParam($page.url, 'type', data.type ?? 'All', 'page')}
@@ -61,36 +64,54 @@
     <option value="Communities">Communities</option>
     <option value="Users">Users</option>
   </Select>
-  <div class="flex flex-row gap-2 items-center">
+  <form
+    class="flex flex-row gap-2 items-center ml-auto"
+    on:submit|preventDefault={() => searchParam($page.url, 'q', query, 'page')}
+  >
     <TextInput
+      label="Query"
       bind:value={query}
       placeholder="!community@instance.com"
-      on:change={() => searchParam($page.url, 'q', query, 'page')}
-    />
-    <Button
-      on:click={() => searchParam($page.url, 'q', query, 'page')}
-      size="lg"
-      class="h-full"
+      inlineAffixes
     >
-      Search
-    </Button>
-  </div>
-</div>
-<div class="max-w-sm my-2">
-  <ObjectAutocomplete
-    label="Community"
-    jwt={$profile?.jwt}
-    listing_type={'All'}
-    showWhenEmpty={true}
-    on:select={(c) =>
-      searchParam($page.url, 'community', c.detail?.id || undefined, 'page')}
-  />
+      <button
+        type="submit"
+        aria-label="Search"
+        slot="suffix"
+        class="flex items-center"
+      >
+        <Icon src={MagnifyingGlass} size="20" mini />
+      </button>
+    </TextInput>
+  </form>
+  <Button
+    slot="summary"
+    size="square-lg"
+    color="tertiary"
+    class="self-end justify-self-center"
+    on:click={() => (moreOptions = !moreOptions)}
+  >
+    <Icon src={ChevronDown} size="20" mini />
+  </Button>
 </div>
+{#if moreOptions}
+  <div transition:slide={{ axis: 'y', easing: expoOut }} class="max-w-sm">
+    <ObjectAutocomplete
+      label="Community"
+      jwt={$profile?.jwt}
+      listing_type={'All'}
+      showWhenEmpty={true}
+      on:select={(c) =>
+        searchParam($page.url, 'community', c.detail?.id || undefined, 'page')}
+    />
+  </div>
+{/if}
 {#if !data.results}
   <Placeholder
     icon={MagnifyingGlass}
     title="No results"
     description="Search across the fediverse"
+    class="pt-4"
   />
 {:else}
   {#await data.streamed.object}