diff --git a/src/event_manager_controller.js b/src/event_manager_controller.js
index c3ac9e8..c65084d 100644
--- a/src/event_manager_controller.js
+++ b/src/event_manager_controller.js
@@ -531,7 +531,7 @@ export function renderEventManagerView(context) {
         setFormError("teamCreateError", "");
         const createdTeam = normalizeRaceTeam({ id: uid("team"), name, driverIds, carIds });
         event.raceConfig.teams = [...getEventTeams(event), createdTeam];
-        setSelectedTeamEditId(createdTeam.id);
+        setSelectedTeamEditId(null);
         saveState();
         rerenderEventManager(eventId);
       });
diff --git a/src/event_manager_view.js b/src/event_manager_view.js
index eddb289..9bbb282 100644
--- a/src/event_manager_view.js
+++ b/src/event_manager_view.js
@@ -731,7 +731,7 @@ export function renderEventManagerMarkup(context) {
                   <div>
                     <h4>${t("events.team_drivers")}</h4>
                     <div class="check-grid">
-                      ${raceDrivers
+                      ${teamDriverPool.drivers
                         .map(
                           (driver) => `
                             <label class="check-card">