1 files changed, 4 insertions, 1 deletions
diff --git a/app.go b/app.go
index 272cd40..6e89f1c 100644
--- a/app.go
+++ b/app.go
@@ -511,10 +511,13 @@ func (app *App) handleIRCEvent(ev interface{}) {
 			})
 		}
 	case irc.SelfJoinEvent:
-		app.win.AddBuffer(ev.Channel)
+		i := app.win.AddBuffer(ev.Channel)
 		app.s.NewHistoryRequest(ev.Channel).
 			WithLimit(200).
 			Before(msg.TimeOrNow())
+		if ev.Requested {
+			app.win.JumpBufferIndex(i)
+		}
 	case irc.UserJoinEvent:
 		body := new(ui.StyledStringBuilder)
 		body.Grow(len(ev.User) + 1)