diff --git a/components/buffer-header.js b/components/buffer-header.js
index 6dcdc89..4fe0835 100644
--- a/components/buffer-header.js
+++ b/components/buffer-header.js
@@ -1,7 +1,7 @@
 import { html, Component } from "../lib/index.js";
 import linkify from "../lib/linkify.js";
 import { strip as stripANSI } from "../lib/ansi.js";
-import { BufferType, NetworkStatus } from "../state.js";
+import { BufferType, NetworkStatus, getNetworkName } from "../state.js";
 
 const UserStatus = {
 	HERE: "here",
@@ -154,8 +154,13 @@ export default function BufferHeader(props) {
 		break;
 	}
 
+	var name = props.buffer.name;
+	if (props.buffer.type == BufferType.SERVER) {
+		name = getNetworkName(props.network, props.bouncerNetwork, props.isBouncer);
+	}
+
 	return html`
-		<span class="title">${props.buffer.name}</span>
+		<span class="title">${name}</span>
 		<span class="description">${description}</span>
 		<span class="actions">${actions}</span>
 	`;
diff --git a/components/buffer-list.js b/components/buffer-list.js
index d42c5f8..74c0c31 100644
--- a/components/buffer-list.js
+++ b/components/buffer-list.js
@@ -1,22 +1,6 @@
 import * as irc from "../lib/irc.js";
 import { html, Component } from "../lib/index.js";
-import { BufferType, Unread, getBufferURL } from "../state.js";
-
-function getNetworkName(network, bouncerNetwork, bouncer) {
-	if (bouncerNetwork && bouncerNetwork.name) {
-		return bouncerNetwork.name;
-	}
-	if (bouncer) {
-		return "bouncer";
-	}
-
-	var netName = network.isupport.get("NETWORK");
-	if (netName) {
-		return netName;
-	}
-
-	return "server";
-}
+import { BufferType, Unread, getBufferURL, getNetworkName } from "../state.js";
 
 function BufferItem(props) {
 	function handleClick(event) {
diff --git a/state.js b/state.js
index 24ed4de..34813db 100644
--- a/state.js
+++ b/state.js
@@ -54,3 +54,19 @@ export function getMessageURL(buf, msg) {
 		return bufURL + "?timestamp=" + encodeURIComponent(msg.tags.time);
 	}
 }
+
+export function getNetworkName(network, bouncerNetwork, isBouncer) {
+	if (bouncerNetwork && bouncerNetwork.name) {
+		return bouncerNetwork.name;
+	}
+	if (isBouncer) {
+		return "bouncer";
+	}
+
+	var netName = network.isupport.get("NETWORK");
+	if (netName) {
+		return netName;
+	}
+
+	return "server";
+}