diff --git a/packages/pl-fe/src/features/draft-statuses/builder.tsx b/packages/pl-fe/src/features/draft-statuses/builder.tsx
index beb05ec3f..17cca3e6c 100644
--- a/packages/pl-fe/src/features/draft-statuses/builder.tsx
+++ b/packages/pl-fe/src/features/draft-statuses/builder.tsx
@@ -32,7 +32,7 @@ const buildStatus = (state: RootState, draftStatus: DraftStatus) => {
     in_reply_to_id: draftStatus.in_reply_to,
     media_attachments: draftStatus.media_attachments,
     poll: buildPoll(draftStatus),
-    quote: draftStatus.quote,
+    quote_id: draftStatus.quote,
     sensitive: draftStatus.sensitive,
     spoiler_text: draftStatus.spoiler_text,
     uri: `/draft_statuses/${draftStatus.draft_id}`,
diff --git a/packages/pl-fe/src/features/draft-statuses/components/draft-status-action-bar.tsx b/packages/pl-fe/src/features/draft-statuses/components/draft-status-action-bar.tsx
index 20a4f7be7..6eda6739d 100644
--- a/packages/pl-fe/src/features/draft-statuses/components/draft-status-action-bar.tsx
+++ b/packages/pl-fe/src/features/draft-statuses/components/draft-status-action-bar.tsx
@@ -11,6 +11,7 @@ import { useSettingsStore } from 'pl-fe/stores/settings';
 
 import type { Status as StatusEntity } from 'pl-fe/normalizers/status';
 import type { DraftStatus } from 'pl-fe/reducers/draft-statuses';
+import { fetchStatus } from 'pl-fe/actions/statuses';
 
 const messages = defineMessages({
   deleteConfirm: { id: 'confirmations.draft_status_delete.confirm', defaultMessage: 'Discard' },
@@ -45,6 +46,7 @@ const DraftStatusActionBar: React.FC<IDraftStatusActionBar> = ({ source, status
   };
 
   const handleEditClick = () => {
+    if (status.in_reply_to_id) dispatch(fetchStatus(status.in_reply_to_id));
     dispatch(setComposeToStatus(status, status.poll, source.text, source.spoiler_text, source.content_type, false, source.draft_id, source.editorState));
     openModal('COMPOSE');
   };