diff --git a/Iceshrimp.Frontend/Components/EmojiPicker.razor b/Iceshrimp.Frontend/Components/EmojiPicker.razor
index 69d86cd3..c72b48d3 100644
--- a/Iceshrimp.Frontend/Components/EmojiPicker.razor
+++ b/Iceshrimp.Frontend/Components/EmojiPicker.razor
@@ -1,3 +1,4 @@
+@using AngleSharp.Text
 @using Iceshrimp.Frontend.Core.Services
 @using Iceshrimp.Shared.Schemas.Web
 @inject EmojiService       EmojiService
@@ -6,11 +7,20 @@
 
 <dialog class="dialog" @ref="EmojiPickerRef">
     <div class="emoji-picker" style="--top: @(_top)px; --left: @(_left)px">
-        @foreach (var el in EmojiList)
+        <input @bind="EmojiFilter" @bind:event="oninput" @bind:after="FilterEmojis" class="search" type="text" placeholder="Search" aria-label="search"/>
+        @foreach (var category in Categories)
         {
-            <div class="emoji">
-                <img @onclick="() => Select(el)" src="@el.PublicUrl" alt="@el.Name"/>
-            </div>
+            <details open>
+                <summary aria-label="category">@category.Key</summary>
+                <div class="emoji-list">
+                    @foreach (var emoji in category.Value)
+                    {
+                        <div class="emoji">
+                            <img @onclick="() => Select(emoji)" src="@emoji.PublicUrl" alt="@emoji.Name" title=":@emoji.Name:" loading="lazy"/>
+                        </div>
+                    }
+                </div>
+            </details>
         }
     </div>
     <ClosingBackdrop OnClose="Close"></ClosingBackdrop>
@@ -25,17 +35,22 @@
     private float                        _left;
     private IJSInProcessObjectReference  _module = null!;
 
+    private string                                  EmojiFilter { get; set; } = "";
+    private Dictionary<string, List<EmojiResponse>> Categories  { get; set; } = [];
+
     protected override async Task OnInitializedAsync()
     {
         GlobalComponentSvc.EmojiPicker = this;
         EmojiList                      = await EmojiService.GetEmoji();
         _module = (IJSInProcessObjectReference)await Js.InvokeAsync<IJSObjectReference>("import",
                                                                                         "./Components/EmojiPicker.razor.js");
+        FilterEmojis();
     }
 
     private async void Select(EmojiResponse emoji)
     {
         await OnEmojiSelect.InvokeAsync(emoji);
+        Close();
     }
 
     private void Close()
@@ -52,4 +67,16 @@
         StateHasChanged();
         _module.InvokeVoid("openDialog", EmojiPickerRef);
     }
+
+    private void FilterEmojis()
+    {
+        Categories = EmojiList
+            .Where(p => p.Name.Contains(EmojiFilter.StripLeadingTrailingSpaces()) || p.Aliases.Count(a => a.Contains(EmojiFilter.StripLeadingTrailingSpaces())) != 0)
+            .OrderBy(p => p.Name)
+            .ThenBy(p => p.Id)
+            .GroupBy(p => p.Category)
+            .OrderBy(p => string.IsNullOrEmpty(p.Key))
+            .ThenBy(p => p.Key)
+            .ToDictionary(p => p.Key ?? "Other", p => p.ToList());
+    }
 }
\ No newline at end of file
diff --git a/Iceshrimp.Frontend/Components/EmojiPicker.razor.css b/Iceshrimp.Frontend/Components/EmojiPicker.razor.css
index 5657aba9..677b30c1 100644
--- a/Iceshrimp.Frontend/Components/EmojiPicker.razor.css
+++ b/Iceshrimp.Frontend/Components/EmojiPicker.razor.css
@@ -1,9 +1,6 @@
 .emoji-picker {
     --top: 0px;
     --left: 0px;
-    display: grid;
-    grid-template-columns: repeat(auto-fill, minmax(2.5rem, 1fr));
-    grid-template-rows: repeat(auto-fill, minmax(2.5rem, 1fr));
     position: absolute;
     background-color: var(--foreground-color);
     border: var(--highlight-color) solid 0.1rem;
@@ -11,11 +8,18 @@
     border-radius: 1rem;
     min-width: 15rem;
     min-height: 10rem;
+    max-height: 20rem;
     overflow: auto;
     top: calc(var(--top) + 2.5rem);
     left: calc(var(--left) - 5.5rem);
 }
 
+.emoji-list {
+    display: grid;
+    grid-template-columns: repeat(auto-fill, minmax(2.5rem, 1fr));
+    grid-template-rows: repeat(auto-fill, minmax(2.5rem, 1fr));
+}
+
 .dialog {
     z-index: +12;
 }
@@ -27,3 +31,13 @@
         width: 2rem;
     }
 }
+
+summary {
+    padding: 0.5rem 0;
+    cursor: pointer;
+}
+
+.search {
+    margin: 0;
+    padding: 0;
+}