diff --git a/components/status/StatusActionsMore.vue b/components/status/StatusActionsMore.vue
index bb3cf503..0fcbda85 100644
--- a/components/status/StatusActionsMore.vue
+++ b/components/status/StatusActionsMore.vue
@@ -91,7 +91,7 @@ const deleteAndRedraft = async () => {
   await openPublishDialog('dialog', await getDraftFromStatus(status), true)
 
   // Go to the new status, if the page is the old status
-  if (lastPublishDialogStatus.value && route.matched.some(m => m.path === '/:server?/@:account/:status'))
+  if (lastPublishDialogStatus.value && route.name === 'status')
     router.push(getStatusRoute(lastPublishDialogStatus.value))
 }
 
diff --git a/composables/statusDrafts.ts b/composables/statusDrafts.ts
index b2b4101e..ec4c93bf 100644
--- a/composables/statusDrafts.ts
+++ b/composables/statusDrafts.ts
@@ -13,6 +13,7 @@ export function getDefaultDraft(options: Partial<Draft['params'] & Omit<Draft, '
     initialText = '',
     sensitive = false,
     spoilerText = '',
+    language,
   } = options
 
   return {
@@ -22,6 +23,7 @@ export function getDefaultDraft(options: Partial<Draft['params'] & Omit<Draft, '
       visibility,
       sensitive,
       spoilerText,
+      language,
     },
     attachments,
     initialText,
@@ -36,6 +38,7 @@ export async function getDraftFromStatus(status: Status): Promise<Draft> {
     attachments: status.mediaAttachments,
     sensitive: status.sensitive,
     spoilerText: status.spoilerText,
+    language: status.language,
   })
 }