diff --git a/src/app/organisms/room/RoomTimeline.tsx b/src/app/organisms/room/RoomTimeline.tsx
index f77c6fd0..65ea9ac5 100644
--- a/src/app/organisms/room/RoomTimeline.tsx
+++ b/src/app/organisms/room/RoomTimeline.tsx
@@ -694,14 +694,7 @@ export function RoomTimeline({ room, eventId, roomInputRef, editor }: RoomTimeli
           );
           const editableEvtId = editableEvt?.getId();
           if (!editableEvtId) return;
-
-          const editMsgElement = scrollRef.current?.querySelector(
-            `[data-message-id="${editableEvtId}"]`
-          ) as HTMLElement | null;
-
-          if (editMsgElement) {
-            setEditId(editableEvtId);
-          }
+          setEditId(editableEvtId);
         }
       },
       [mx, room, editor]