2 files changed, 6 insertions, 1 deletions
diff --git a/app.go b/app.go
index 6b5614e..5ab0052 100644
--- a/app.go
+++ b/app.go
@@ -795,6 +795,7 @@ func (app *App) handleIRCEvent(netID string, ev interface{}) {
 		// Restore last buffer
 		if netID == app.lastNetID && ev.Channel == app.lastBuffer {
 			app.win.JumpBufferNetwork(app.lastNetID, app.lastBuffer)
+			app.win.HorizontalBufferScrollTo()
 			app.lastNetID = ""
 			app.lastBuffer = ""
 		}
diff --git a/ui/ui.go b/ui/ui.go
index 45c3472..155601f 100644
--- a/ui/ui.go
+++ b/ui/ui.go
@@ -253,7 +253,11 @@ func (ui *UI) HasOverlay() bool {
 }
 
 func (ui *UI) AddBuffer(netID, netName, title string) (i int, added bool) {
-	return ui.bs.Add(netID, netName, title)
+	i, added = ui.bs.Add(netID, netName, title)
+	if added {
+		ui.HorizontalBufferScrollTo()
+	}
+	return
 }
 
 func (ui *UI) RemoveBuffer(netID, title string) {