diff --git a/packages/pl-fe/src/features/notifications/components/notification.tsx b/packages/pl-fe/src/features/notifications/components/notification.tsx
index 8241a2c43..435afc4b7 100644
--- a/packages/pl-fe/src/features/notifications/components/notification.tsx
+++ b/packages/pl-fe/src/features/notifications/components/notification.tsx
@@ -2,7 +2,7 @@ import React, { useCallback } from 'react';
 import { defineMessages, useIntl, FormattedList, FormattedMessage, IntlShape, MessageDescriptor } from 'react-intl';
 import { Link, useHistory } from 'react-router-dom';
 
-import { mentionCompose } from 'pl-fe/actions/compose';
+import { mentionCompose, replyCompose } from 'pl-fe/actions/compose';
 import { reblog, favourite, unreblog, unfavourite } from 'pl-fe/actions/interactions';
 import HoverAccountWrapper from 'pl-fe/components/hover-account-wrapper';
 import Icon from 'pl-fe/components/icon';
@@ -246,7 +246,9 @@ const Notification: React.FC<INotification> = (props) => {
   const handleMention = useCallback((e?: KeyboardEvent) => {
     e?.preventDefault();
 
-    if (account && typeof account === 'object') {
+    if (status) {
+      dispatch(replyCompose(status, account));
+    } else {
       dispatch(mentionCompose(account));
     }
   }, [account]);
diff --git a/packages/pl-fe/src/reducers/compose.ts b/packages/pl-fe/src/reducers/compose.ts
index eaed994b0..2ddd15aca 100644
--- a/packages/pl-fe/src/reducers/compose.ts
+++ b/packages/pl-fe/src/reducers/compose.ts
@@ -182,10 +182,7 @@ const statusToTextMentions = (status: Pick<Status, 'account' | 'mentions'>, acco
   const author = status.account.acct;
   const mentions = status.mentions.map((m) => m.acct) || [];
 
-  return [...new Set([author, ...mentions]
-    .filter(acct => acct !== account.acct))]
-    .map(m => `@${m} `)
-    .join('');
+  return [...new Set([author, ...mentions].filter(acct => acct !== account.acct))].map(m => `@${m} `).join('');
 };
 
 const statusToMentionsArray = (status: Pick<Status, 'account' | 'mentions'>, account: Pick<Account, 'acct'>, rebloggedBy?: Pick<Account, 'acct'>) => {