diff --git a/app/soapbox/features/compose/components/reply_mentions.tsx b/app/soapbox/features/compose/components/reply_mentions.tsx
index 577334281..865f6539d 100644
--- a/app/soapbox/features/compose/components/reply_mentions.tsx
+++ b/app/soapbox/features/compose/components/reply_mentions.tsx
@@ -36,7 +36,9 @@ const ReplyMentions: React.FC<IReplyMentions> = ({ composeId }) => {
   const handleClick = (e: React.MouseEvent<HTMLAnchorElement>) => {
     e.preventDefault();
 
-    dispatch(openModal('REPLY_MENTIONS'));
+    dispatch(openModal('REPLY_MENTIONS', {
+      composeId,
+    }));
   };
 
   if (!parentTo || (parentTo.size === 0)) {
diff --git a/app/soapbox/features/share/index.tsx b/app/soapbox/features/share/index.tsx
index 562f23689..fdb5caa3d 100644
--- a/app/soapbox/features/share/index.tsx
+++ b/app/soapbox/features/share/index.tsx
@@ -19,7 +19,7 @@ const Share = () => {
     .join('\n\n');
 
   if (text) {
-    dispatch(openComposeWithText(text));
+    dispatch(openComposeWithText('compose-modal', text));
   }
 
   return (
@@ -27,4 +27,4 @@ const Share = () => {
   );
 };
 
-export default Share;
\ No newline at end of file
+export default Share;
diff --git a/app/soapbox/features/ui/components/reply_mentions_modal.tsx b/app/soapbox/features/ui/components/reply_mentions_modal.tsx
index 43aaa24c4..2c8fc73b1 100644
--- a/app/soapbox/features/ui/components/reply_mentions_modal.tsx
+++ b/app/soapbox/features/ui/components/reply_mentions_modal.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useCallback } from 'react';
 import { FormattedMessage } from 'react-intl';
 
 import { Modal } from 'soapbox/components/ui';
@@ -18,7 +18,8 @@ interface IReplyMentionsModal {
 const ReplyMentionsModal: React.FC<IReplyMentionsModal> = ({ composeId, onClose }) => {
   const compose = useCompose(composeId);
 
-  const status = useAppSelector<StatusEntity | null>(state => makeGetStatus()(state, { id: compose.in_reply_to! }));
+  const getStatus = useCallback(makeGetStatus(), []);
+  const status = useAppSelector<StatusEntity | null>(state => getStatus(state, { id: compose.in_reply_to! }));
   const account = useAppSelector((state) => state.accounts.get(state.me));
 
   const mentions = statusToMentionsAccountIdsArray(status!, account!);