diff --git a/gui.py b/gui.py
index 7937896..ec46c73 100644
--- a/gui.py
+++ b/gui.py
@@ -281,6 +281,7 @@ class GameSelector:
             self._selection = None
         else:
             self._selection = self._list.get(current[0])
+        self._manager._twitch.change_state(State.GAME_SELECT)
 
     def get_selection(self) -> Game:
         if self._selection is None:
diff --git a/twitch.py b/twitch.py
index f054e2a..63b9bb1 100644
--- a/twitch.py
+++ b/twitch.py
@@ -188,7 +188,7 @@ class Twitch:
                 await self.websocket.start()
                 self.gui.games.set_games(games)
                 selected_game = self.gui.games.get_selection()
-                self.change_state(State.CHANNEL_FETCH)
+                self.change_state(State.CHANNEL_CLEANUP)
             elif self._state is State.CHANNEL_FETCH:
                 if selected_game is None:
                     self.change_state(State.GAME_SELECT)