diff --git a/src/worldshaperStudio/runtime.ts b/src/worldshaperStudio/runtime.ts
index 74c6eb7..8b2579b 100644
--- a/src/worldshaperStudio/runtime.ts
+++ b/src/worldshaperStudio/runtime.ts
@@ -1212,7 +1212,13 @@ export function startWorldshaperStudio(bootstrap: WorldshaperStudioBootstrap, in
       runtimeUniqueId,
     });
     const { appendEditorLogEntry, getEditorLogEntries, clearEditorLogEntries } = runtimeLogging;
+    let historyController = null;
+    let npcController = null;
+    let sidebarController = null;
     let renderController = null;
+    let persistenceController = null;
+    let importController = null;
+    let interactionController = null;
     const documentController = createMapDocumentController({
       mapId: currentMapId,
       getMapId: () => currentMapId,
@@ -4750,7 +4756,13 @@ export function startWorldshaperStudio(bootstrap: WorldshaperStudioBootstrap, in
       syncWorldNeighborhoodForViewport,
       drawNow,
     });
+    historyController = runtimeControllerBootstrap.historyController;
+    npcController = runtimeControllerBootstrap.npcController;
+    sidebarController = runtimeControllerBootstrap.sidebarController;
     renderController = runtimeControllerBootstrap.renderController;
+    persistenceController = runtimeControllerBootstrap.persistenceController;
+    importController = runtimeControllerBootstrap.importController;
+    interactionController = runtimeControllerBootstrap.interactionController;
     statusLogWindowController = runtimeControllerBootstrap.statusLogWindowController;
     runtimeLogging.setStatusLogWindowController(statusLogWindowController);
 }
diff --git a/src/worldshaperStudio/runtimeControllerBootstrap.ts b/src/worldshaperStudio/runtimeControllerBootstrap.ts
index 9149b45..465c53c 100644
--- a/src/worldshaperStudio/runtimeControllerBootstrap.ts
+++ b/src/worldshaperStudio/runtimeControllerBootstrap.ts
@@ -143,12 +143,12 @@ export function initializeRuntimeControllers(config) {
   uiScope.reloadGraphicsContentFromApi = reloadGraphicsContentFromApi;
 
   syncDocumentTitle();
-  createHistoryController(scope);
-  createNpcController(scope);
-  createSidebarController(scope);
+  const historyController = createHistoryController(scope);
+  const npcController = createNpcController(scope);
+  const sidebarController = createSidebarController(scope);
   const renderController = createRenderController(scope);
-  createPersistenceController(scope);
-  createImportController(scope);
+  const persistenceController = createPersistenceController(scope);
+  const importController = createImportController(scope);
   const interactionController = createInteractionController(scope);
 
   const persistPopupBoundsDeferred = createDebouncedCallback(() => {
@@ -193,7 +193,13 @@ export function initializeRuntimeControllers(config) {
   });
 
   return {
+    historyController,
+    npcController,
+    sidebarController,
     renderController,
+    persistenceController,
+    importController,
+    interactionController,
     statusLogWindowController,
     changelogSplashWindowController,
     persistPopupBoundsDeferred,