diff --git a/src/dispatch/static/dispatch/src/incident/EditEventDialog.vue b/src/dispatch/static/dispatch/src/incident/EditEventDialog.vue
index e3d7c41355b4..8ed3d98b2908 100644
--- a/src/dispatch/static/dispatch/src/incident/EditEventDialog.vue
+++ b/src/dispatch/static/dispatch/src/incident/EditEventDialog.vue
@@ -14,12 +14,13 @@
                 v-model="started_at"
                 class="time-picker"
                 :timezone="timezone"
+                @update:modelValue="update_started_at"
               />
               <span
                 class="ml-10 time-utc text-caption"
                 style="position: absolute; margin-top: -20px"
               >
-                Time in UTC is {{ formatToUTC(started_at) }}
+                Time in UTC is {{ formatToUTC(started_at_in_utc) }}
               </span>
             </v-col>
             <v-col cols="5">
@@ -77,6 +78,7 @@ export default {
     return {
       timezones: ["UTC", "America/Los_Angeles"],
       timezone: "UTC",
+      started_at_in_utc: "",
     }
   },
 
@@ -109,9 +111,14 @@ export default {
     setTimeToNow() {
       this.eventStart = new Date()
     },
+    update_started_at(val) {
+      this.started_at = val
+      this.started_at_in_utc = val
+    }
   },
   mounted() {
     this.init()
+    this.started_at_in_utc = this.started_at
   },
 }
 </script>
diff --git a/src/dispatch/static/dispatch/src/incident/TimelineTab.vue b/src/dispatch/static/dispatch/src/incident/TimelineTab.vue
index 68434af44250..e632518309a3 100644
--- a/src/dispatch/static/dispatch/src/incident/TimelineTab.vue
+++ b/src/dispatch/static/dispatch/src/incident/TimelineTab.vue
@@ -11,7 +11,7 @@
         Export
       </v-btn>
       <timeline-filter-dialog ref="filter_dialog" />
-      <edit-event-dialog />
+      <edit-event-dialog v-if="showEditEventDialog" />
       <delete-event-dialog />
     </v-row>
     <template v-if="events && events.length">
@@ -66,7 +66,7 @@
             </v-col>
             <v-col cols="1">
               <div v-if="isEditable(event)" class="custom-event-edit">
-                <v-btn variant="plain" @click="showEditEventDialog(event)">
+                <v-btn variant="plain" @click="showNewEditEventDialog(event)">
                   <v-icon>mdi-pencil</v-icon>
                 </v-btn>
                 <br />
@@ -197,7 +197,12 @@ export default {
   },
 
   computed: {
-    ...mapFields("incident", ["selected.events", "selected.name", "timeline_filters"]),
+    ...mapFields("incident", [
+      "selected.events",
+      "selected.name",
+      "timeline_filters",
+      "dialogs.showEditEventDialog",
+    ]),
 
     sortedEvents: function () {
       return this.events.slice().sort((a, b) => new Date(a.started_at) - new Date(b.started_at))
@@ -206,7 +211,7 @@ export default {
   methods: {
     ...mapActions("incident", [
       "showNewEventDialog",
-      "showEditEventDialog",
+      "showNewEditEventDialog",
       "showDeleteEventDialog",
       "showNewPreEventDialog",
       "togglePin",
diff --git a/src/dispatch/static/dispatch/src/incident/store.js b/src/dispatch/static/dispatch/src/incident/store.js
index 81be1bf32601..27f67b543215 100644
--- a/src/dispatch/static/dispatch/src/incident/store.js
+++ b/src/dispatch/static/dispatch/src/incident/store.js
@@ -247,7 +247,7 @@ const actions = {
     commit("SET_DIALOG_SHOW_HANDOFF", false)
     commit("RESET_SELECTED")
   },
-  showEditEventDialog({ commit }, event) {
+  showNewEditEventDialog({ commit }, event) {
     state.selected.currentEvent = event
     commit("SET_DIALOG_EDIT_EVENT", true)
   },