diff --git a/web/src/main/kotlin/world/phantasmal/web/questEditor/QuestEditor.kt b/web/src/main/kotlin/world/phantasmal/web/questEditor/QuestEditor.kt
index 67839f84..3bb5fbab 100644
--- a/web/src/main/kotlin/world/phantasmal/web/questEditor/QuestEditor.kt
+++ b/web/src/main/kotlin/world/phantasmal/web/questEditor/QuestEditor.kt
@@ -46,6 +46,7 @@ class QuestEditor(
         // Stores
         val areaStore = addDisposable(AreaStore(areaAssetLoader))
         val questEditorStore = addDisposable(QuestEditorStore(
+            questLoader,
             uiStore,
             areaStore,
             undoManager,
@@ -56,7 +57,6 @@ class QuestEditor(
         val questEditorController = addDisposable(QuestEditorController(questEditorUiPersister))
         val toolbarController = addDisposable(QuestEditorToolbarController(
             uiStore,
-            questLoader,
             areaStore,
             questEditorStore,
         ))
diff --git a/web/src/main/kotlin/world/phantasmal/web/questEditor/controllers/QuestEditorToolbarController.kt b/web/src/main/kotlin/world/phantasmal/web/questEditor/controllers/QuestEditorToolbarController.kt
index d0b1c9ae..f7e53f0b 100644
--- a/web/src/main/kotlin/world/phantasmal/web/questEditor/controllers/QuestEditorToolbarController.kt
+++ b/web/src/main/kotlin/world/phantasmal/web/questEditor/controllers/QuestEditorToolbarController.kt
@@ -17,7 +17,6 @@ import world.phantasmal.observable.value.mutableVal
 import world.phantasmal.observable.value.value
 import world.phantasmal.web.core.PwToolType
 import world.phantasmal.web.core.stores.UiStore
-import world.phantasmal.web.questEditor.loading.QuestLoader
 import world.phantasmal.web.questEditor.models.AreaModel
 import world.phantasmal.web.questEditor.stores.AreaStore
 import world.phantasmal.web.questEditor.stores.QuestEditorStore
@@ -34,7 +33,6 @@ class AreaAndLabel(val area: AreaModel, val label: String)
 
 class QuestEditorToolbarController(
     uiStore: UiStore,
-    private val questLoader: QuestLoader,
     private val areaStore: AreaStore,
     private val questEditorStore: QuestEditorStore,
 ) : Controller() {
@@ -127,7 +125,7 @@ class QuestEditorToolbarController(
     suspend fun createNewQuest(episode: Episode) {
         setFilename("")
         setVersion(Version.BB)
-        setCurrentQuest(questLoader.loadDefaultQuest(episode))
+        questEditorStore.setDefaultQuest(episode)
     }
 
     suspend fun openFiles(files: List<File>) {
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 62e5a26c..da3211cf 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
@@ -1,6 +1,8 @@
 package world.phantasmal.web.questEditor.stores
 
+import kotlinx.coroutines.launch
 import mu.KotlinLogging
+import world.phantasmal.lib.Episode
 import world.phantasmal.observable.value.Val
 import world.phantasmal.observable.value.and
 import world.phantasmal.observable.value.list.emptyListVal
@@ -12,12 +14,14 @@ import world.phantasmal.web.core.stores.UiStore
 import world.phantasmal.web.core.undo.UndoManager
 import world.phantasmal.web.core.undo.UndoStack
 import world.phantasmal.web.questEditor.QuestRunner
+import world.phantasmal.web.questEditor.loading.QuestLoader
 import world.phantasmal.web.questEditor.models.*
 import world.phantasmal.webui.stores.Store
 
 private val logger = KotlinLogging.logger {}
 
 class QuestEditorStore(
+    private val questLoader: QuestLoader,
     uiStore: UiStore,
     private val areaStore: AreaStore,
     private val undoManager: UndoManager,
@@ -87,6 +91,8 @@ class QuestEditorStore(
                 _selectedEntity.value = null
             }
         }
+
+        scope.launch { setDefaultQuest(Episode.I) }
     }
 
     override fun dispose() {
@@ -136,6 +142,12 @@ class QuestEditorStore(
         }
     }
 
+    suspend fun setDefaultQuest(episode: Episode) {
+        setCurrentQuest(
+            convertQuestToModel(questLoader.loadDefaultQuest(episode), areaStore::getVariant)
+        )
+    }
+
     private fun setSectionOnQuestEntities(
         entities: List<QuestEntityModel<*, *>>,
         variant: AreaVariantModel,