diff --git a/components/buffer-list.js b/components/buffer-list.js
index 72439e2..ecc3d61 100644
--- a/components/buffer-list.js
+++ b/components/buffer-list.js
@@ -24,6 +24,13 @@ function BufferItem(props) {
 	let classes = ["type-" + props.buffer.type];
 	if (props.active) {
 		classes.push("active");
+		// Scroll active buffer into view
+		setTimeout(() => {
+			const bufferElement = document.querySelector(`li.active`);
+			if (bufferElement) {
+				bufferElement.scrollIntoView({ behavior: "auto", block: "center" });
+			}
+		}, 0);
 	}
 	if (props.buffer.unread !== Unread.NONE) {
 		classes.push("unread-" + props.buffer.unread);