diff --git a/Iceshrimp.Frontend/Components/Compose.razor b/Iceshrimp.Frontend/Components/Compose.razor
index 24bc6e93..3825e78e 100644
--- a/Iceshrimp.Frontend/Components/Compose.razor
+++ b/Iceshrimp.Frontend/Components/Compose.razor
@@ -1,8 +1,11 @@
+@using FParsec
 @using Iceshrimp.Assets.PhosphorIcons
 @using Iceshrimp.Frontend.Core.Services
 @using Iceshrimp.Shared.Schemas
+@using Iceshrimp.Frontend.Components.Note
 @inject IJSRuntime Js
 @inject ApiService ApiService
+@inject ComposeService ComposeService
 <dialog class="compose" @ref="Dialog">
     <div class="header">
         <button @onclick="CloseDialog">
@@ -12,6 +15,12 @@
         </Dropdown>
         <button @onclick="SendNote" class="post-btn">Post<Icon Name="Icons.PaperPlaneRight"/></button>
     </div>
+    @if (ReplyTo != null)
+    {
+    <div class="reply-to">
+        <NoteComponent Note="ReplyTo" AsQuote="true" />
+    </div>
+    }
     @if (NoteDraft.Cw != null)
     {
         <input @bind="NoteDraft.Cw" class="input cw-field" placeholder="Content Warning"/>
@@ -36,6 +45,7 @@
     private IJSObjectReference?      _module;
     private IList<DriveFileResponse> Attachments { get; set; } = [];
     private InputFile                UploadInput { get; set; }
+    private NoteBase?            ReplyTo     { get; set; }
 
     private NoteCreateRequest NoteDraft { get; set; } = new NoteCreateRequest
     {
@@ -83,8 +93,15 @@
         await _module.InvokeVoidAsync("openUpload", UploadInput.Element);
     }
 
-    public async Task OpenDialog()
+    public async Task OpenDialog(NoteBase? replyTo = null)
     {
+        if (replyTo != null)
+        {
+            ReplyTo           = replyTo;
+            NoteDraft.ReplyId = replyTo.Id;
+            StateHasChanged();
+        }
+
         await _module.InvokeVoidAsync("openDialog", Dialog);
     }
 
@@ -124,6 +141,7 @@
         {
             _module = await Js.InvokeAsync<IJSObjectReference>("import",
                                                                "./Components/Compose.razor.js");
+            ComposeService.ComposeDialog = this;
         }
     }
 
diff --git a/Iceshrimp.Frontend/Components/Compose.razor.css b/Iceshrimp.Frontend/Components/Compose.razor.css
index d4ec584c..2deed868 100644
--- a/Iceshrimp.Frontend/Components/Compose.razor.css
+++ b/Iceshrimp.Frontend/Components/Compose.razor.css
@@ -47,4 +47,9 @@
 
 .file-input {
     display: none;
+}
+.reply-to {
+    border: solid var(--highlight-color) 0.1rem;
+    border-radius: 0.75rem;
+    padding: 0.5rem;
 }
\ No newline at end of file
diff --git a/Iceshrimp.Frontend/Components/Dropdown.razor.css b/Iceshrimp.Frontend/Components/Dropdown.razor.css
index a61b72f3..f22c064f 100644
--- a/Iceshrimp.Frontend/Components/Dropdown.razor.css
+++ b/Iceshrimp.Frontend/Components/Dropdown.razor.css
@@ -7,4 +7,8 @@
     border-style: solid;
     border-width: 0.1rem;
     border-radius: 0.5rem;
+}
+
+.dropdown-root {
+    display: inline-block
 }
\ No newline at end of file
diff --git a/Iceshrimp.Frontend/Components/Note/NoteComponent.razor b/Iceshrimp.Frontend/Components/Note/NoteComponent.razor
index 44116afa..71195327 100644
--- a/Iceshrimp.Frontend/Components/Note/NoteComponent.razor
+++ b/Iceshrimp.Frontend/Components/Note/NoteComponent.razor
@@ -1,7 +1,8 @@
 @using Iceshrimp.Frontend.Core.Services
 @using Iceshrimp.Shared.Schemas
-@inject ApiService ApiService;
+@inject ApiService        ApiService;
 @inject NavigationManager NavigationManager
+@inject ComposeService ComposeService
 <CascadingValue Value="this">
     <div class="note-header">
         <NoteUserInfo
@@ -84,4 +85,9 @@
             StateHasChanged();
         }
     }
+
+    public void Reply()
+    {
+        ComposeService.ComposeDialog?.OpenDialog(Note);
+    }
 }
\ No newline at end of file
diff --git a/Iceshrimp.Frontend/Components/Note/NoteFooter.razor b/Iceshrimp.Frontend/Components/Note/NoteFooter.razor
index c3c29732..de81f1e7 100644
--- a/Iceshrimp.Frontend/Components/Note/NoteFooter.razor
+++ b/Iceshrimp.Frontend/Components/Note/NoteFooter.razor
@@ -10,7 +10,7 @@
             }
         </div>
     }
-    <button class="btn" @onclick:stopPropagation="true">
+    <button class="btn" @onclick="Reply" @onclick:stopPropagation="true">
         <Icon Name="Icons.ArrowUUpLeft" Size="1.3em"/>
     </button>
     <button class="btn" @onclick:stopPropagation="true">
@@ -46,4 +46,9 @@
     {
         NoteComponent.Like();
     }
+
+    private void Reply()
+    {
+        NoteComponent.Reply();
+    }
 }
\ No newline at end of file
diff --git a/Iceshrimp.Frontend/Core/Services/ComposeService.cs b/Iceshrimp.Frontend/Core/Services/ComposeService.cs
index 63e4a700..b50ce063 100644
--- a/Iceshrimp.Frontend/Core/Services/ComposeService.cs
+++ b/Iceshrimp.Frontend/Core/Services/ComposeService.cs
@@ -1,6 +1,9 @@
+using Iceshrimp.Frontend.Components;
+using Microsoft.AspNetCore.Components;
+
 namespace Iceshrimp.Frontend.Core.Services;
 
 public class ComposeService
 {
-    
+    public Compose? ComposeDialog { get; set; }
 }
\ No newline at end of file
diff --git a/Iceshrimp.Frontend/Startup.cs b/Iceshrimp.Frontend/Startup.cs
index 93c5de96..024171c5 100644
--- a/Iceshrimp.Frontend/Startup.cs
+++ b/Iceshrimp.Frontend/Startup.cs
@@ -17,6 +17,7 @@ builder.Services.AddIntersectionObserver();
 builder.Services.AddSingleton<SessionService>();
 builder.Services.AddSingleton<StreamingService>();
 builder.Services.AddScoped<AuthenticationStateProvider, CustomAuthStateProvider>();
+builder.Services.AddSingleton<ComposeService>();
 builder.Services.AddAuthorizationCore();
 builder.Services.AddCascadingAuthenticationState();
 builder.Services.AddBlazoredLocalStorageAsSingleton();