diff --git a/apps/web/src/App.tsx b/apps/web/src/App.tsx
index c94768d..68a978d 100644
--- a/apps/web/src/App.tsx
+++ b/apps/web/src/App.tsx
@@ -259,6 +259,8 @@ export function App() {
 		const active = encounter.combatants[encounter.activeIndex];
 		if (!active?.creatureId || !isLoaded) return;
 		setSelectedCreatureId(active.creatureId as CreatureId);
+		setBulkImportMode(false);
+		setSourceManagerMode(false);
 	}, [encounter.activeIndex, encounter.combatants, isLoaded]);
 
 	const isEmpty = encounter.combatants.length === 0;