diff --git a/components/app.js b/components/app.js
index 751a006..68480c7 100644
--- a/components/app.js
+++ b/components/app.js
@@ -821,8 +821,8 @@ export default class App extends Component {
 		this.privmsg(buf.name, text);
 	}
 
-	handleBufferListClick(name) {
-		this.switchBuffer({ name });
+	handleBufferListClick(id) {
+		this.switchBuffer(id);
 	}
 
 	handleJoinClick(event) {
diff --git a/components/buffer-list.js b/components/buffer-list.js
index 8914b53..2491b98 100644
--- a/components/buffer-list.js
+++ b/components/buffer-list.js
@@ -49,7 +49,7 @@ export default function BufferList(props) {
 	return html`
 		<ul>
 			${Array.from(props.buffers.values()).map((buf) => html`
-				<${BufferItem} key=${buf.id} buffer=${buf} network=${props.networks.get(buf.network)} onClick=${() => props.onBufferClick(buf.name)} active=${props.activeBuffer == buf.id}/>
+				<${BufferItem} key=${buf.id} buffer=${buf} network=${props.networks.get(buf.network)} onClick=${() => props.onBufferClick(buf)} active=${props.activeBuffer == buf.id}/>
 			`)}
 		</ul>
 	`;