2 files changed, 2 insertions, 2 deletions
diff --git a/TODO b/TODO
index 2604568..83d8654 100644
--- a/TODO
+++ b/TODO
@@ -15,8 +15,6 @@ Other stuff:
 - The Start+E editbox-only mode should be exited when the user
   presses Return (or shift-clear, or I guess anything that hides
   the editbox).
-- Idea inspired by pusakat: after joining channels on connect, it
-  should switch to the first one (screen 3).
 - Status indicators # M J etc should disappear at some point. When
   the user switches windows. Also maybe there should be a timer.
 - ^U works, but is slow (calls backspace() in a loop, which does a
diff --git a/src/irc.c b/src/irc.c
index 676c421..1b1e635 100644
--- a/src/irc.c
+++ b/src/irc.c
@@ -444,6 +444,8 @@ static void do_numeric(void) {
 		case ERR_NOMOTD:
 			hide_motd = 0;
 			cmd_rejoin_chans();
+			if(scr_names[2][0] == '#')
+				scr_display(2);
 			break;
 
 		case RPL_NAMREPLY: