diff --git a/client/src/events.jsx b/client/src/events.jsx
index a6718ee1..15b4db68 100644
--- a/client/src/events.jsx
+++ b/client/src/events.jsx
@@ -9,14 +9,15 @@ function registerEvents(store) {
         store.dispatch(actions.setPing(ping));
     }
 
-    function setTeam(team) {
-        store.dispatch(actions.setTeam(team));
-    }
-
     function setNav(v) {
         store.dispatch(actions.setNav(v));
     }
 
+    function setTeam(team) {
+        store.dispatch(actions.setTeam(team));
+        setNav('list');
+    }
+
     function setConstructList(constructs) {
         store.dispatch(actions.setConstructs(constructs));
     }