diff --git a/web/src/main/kotlin/world/phantasmal/web/questEditor/actions/CreateEventAction.kt b/web/src/main/kotlin/world/phantasmal/web/questEditor/actions/CreateEventAction.kt
index 4e8cea2a..17b73e0a 100644
--- a/web/src/main/kotlin/world/phantasmal/web/questEditor/actions/CreateEventAction.kt
+++ b/web/src/main/kotlin/world/phantasmal/web/questEditor/actions/CreateEventAction.kt
@@ -11,7 +11,7 @@ class CreateEventAction(
     private val index: Int,
     private val event: QuestEventModel,
 ) : Action {
-    override val description: String = "Add event ${event.id.value}"
+    override val description: String = "Add event"
 
     override fun execute() {
         change {
diff --git a/web/src/main/kotlin/world/phantasmal/web/questEditor/stores/QuestEditorStore.kt b/web/src/main/kotlin/world/phantasmal/web/questEditor/stores/QuestEditorStore.kt
index 78fb8dba..5636b05a 100644
--- a/web/src/main/kotlin/world/phantasmal/web/questEditor/stores/QuestEditorStore.kt
+++ b/web/src/main/kotlin/world/phantasmal/web/questEditor/stores/QuestEditorStore.kt
@@ -192,6 +192,12 @@ class QuestEditorStore(
                     setSelectedEntity(null)
                 }
             }
+
+            val quest = currentQuest.value
+
+            if (quest != null && _currentArea.value?.id != event.areaId) {
+                _currentArea.value = areaStore.getArea(quest.episode, event.areaId)
+            }
         }
 
         _selectedEvent.value = event
diff --git a/web/src/test/kotlin/world/phantasmal/web/questEditor/controllers/EventsControllerTests.kt b/web/src/test/kotlin/world/phantasmal/web/questEditor/controllers/EventsControllerTests.kt
index d804fd7c..ad13dc2a 100644
--- a/web/src/test/kotlin/world/phantasmal/web/questEditor/controllers/EventsControllerTests.kt
+++ b/web/src/test/kotlin/world/phantasmal/web/questEditor/controllers/EventsControllerTests.kt
@@ -38,6 +38,8 @@ class EventsControllerTests : WebTestSuite {
         store.redo()
 
         assertEquals(1, quest.events.value.size)
+        assertTrue(store.canUndo.value)
+        assertFalse(store.canRedo.value)
     }
 
     @Test