diff --git a/src/utils/EventUtils.js b/src/utils/EventUtils.js
index ff20a68e3c..8b219d2a03 100644
--- a/src/utils/EventUtils.js
+++ b/src/utils/EventUtils.js
@@ -64,7 +64,7 @@ export function canEditOwnEvent(mxEvent) {
 const MAX_JUMP_DISTANCE = 100;
 export function findEditableEvent(room, isForward, fromEventId = undefined) {
     const liveTimeline = room.getLiveTimeline();
-    const events = liveTimeline.getEvents();
+    const events = liveTimeline.getEvents().concat(room.getPendingEvents());
     const maxIdx = events.length - 1;
     const inc = isForward ? 1 : -1;
     const beginIdx = isForward ? 0 : maxIdx;