diff --git a/web/utils/tooltip-action-utils.js b/web/utils/tooltip-action-utils.js
--- a/web/utils/tooltip-action-utils.js
+++ b/web/utils/tooltip-action-utils.js
@@ -5,7 +5,9 @@
 import * as React from 'react';
 
 import { useModalContext } from 'lib/components/modal-provider.react.js';
+import SWMansionIcon from 'lib/components/SWMansionIcon.react.js';
 import type { ChatMessageInfoItem } from 'lib/selectors/chat-selectors.js';
+import { useCanEditMessage } from 'lib/shared/edit-messages-utils.js';
 import { createMessageReply } from 'lib/shared/message-utils.js';
 import { useCanCreateReactionFromMessage } from 'lib/shared/reaction-utils.js';
 import {
@@ -26,6 +28,7 @@
   type TooltipSize,
   type TooltipPosition,
 } from './tooltip-utils.js';
+import { useEditModalContext } from '../chat/edit-message-provider.js';
 import MessageTooltip from '../chat/message-tooltip.react.js';
 import type { PositionInfo } from '../chat/position-types.js';
 import { useTooltipContext } from '../chat/tooltip-provider.js';
@@ -224,6 +227,47 @@
   }, [canTogglePin, inputState, isPinned, pushModal, item, threadInfo]);
 }
 
+function useMessageEditAction(
+  item: ChatMessageInfoItem,
+  threadInfo: ThreadInfo,
+): ?MessageTooltipAction {
+  const { messageInfo } = item;
+
+  const canEditMessage = useCanEditMessage(threadInfo, messageInfo);
+  const { renderEditModal } = useEditModalContext();
+  const { clearTooltip } = useTooltipContext();
+
+  return React.useMemo(() => {
+    if (!canEditMessage) {
+      return null;
+    }
+    const buttonContent = (
+      <SWMansionIcon icon="edit-1" size={18} disableFill={false} />
+    );
+    const onClickEdit = () => {
+      clearTooltip();
+      renderEditModal({
+        messageInfo: item,
+        threadInfo,
+        isError: false,
+        editedMessageDraft: messageInfo.text,
+      });
+    };
+    return {
+      actionButtonContent: buttonContent,
+      onClick: onClickEdit,
+      label: 'Edit',
+    };
+  }, [
+    canEditMessage,
+    clearTooltip,
+    item,
+    messageInfo.text,
+    renderEditModal,
+    threadInfo,
+  ]);
+}
+
 function useMessageTooltipActions(
   item: ChatMessageInfoItem,
   threadInfo: ThreadInfo,
@@ -233,6 +277,7 @@
   const copyAction = useMessageCopyAction(item);
   const reactAction = useMessageReactAction(item, threadInfo);
   const togglePinAction = useMessageTogglePinAction(item, threadInfo);
+  const editAction = useMessageEditAction(item, threadInfo);
   return React.useMemo(
     () =>
       [
@@ -241,8 +286,16 @@
         copyAction,
         reactAction,
         togglePinAction,
+        editAction,
       ].filter(Boolean),
-    [replyAction, sidebarAction, copyAction, reactAction, togglePinAction],
+    [
+      replyAction,
+      sidebarAction,
+      copyAction,
+      reactAction,
+      togglePinAction,
+      editAction,
+    ],
   );
 }