diff --git a/frontend/src/Editor/Inspector/EventManager.jsx b/frontend/src/Editor/Inspector/EventManager.jsx
index 4612039050..de19db6554 100644
--- a/frontend/src/Editor/Inspector/EventManager.jsx
+++ b/frontend/src/Editor/Inspector/EventManager.jsx
@@ -68,7 +68,11 @@ export const EventManager = ({
   useEffect(() => {
     if (_.isEqual(currentEvents, events)) return;
 
-    setEvents(currentEvents || []);
+    const sortedEvents = currentEvents.sort((a, b) => {
+      return a.index - b.index;
+    });
+
+    setEvents(sortedEvents || []);
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [JSON.stringify(currentEvents)]);
 
@@ -235,8 +239,6 @@ export const EventManager = ({
 
     newEvents[index] = updatedEvent;
 
-    setEvents(newEvents);
-
     updateAppVersionEventHandlers(
       [
         {
@@ -848,8 +850,6 @@ export const EventManager = ({
       };
     });
 
-    setEvents(result);
-
     updateAppVersionEventHandlers(
       reorderedEvents.map((event) => ({
         event_id: event.id,