diff --git a/src/disco.py b/src/disco.py
index 5aec4450c..ffed4a4ef 100644
--- a/src/disco.py
+++ b/src/disco.py
@@ -948,9 +948,17 @@ class AgentBrowser:
         Set the window title based on agent info
         """
         # Set the banner and window title
-        if 'name' in identities[0]:
-            name = identities[0]['name']
-            self.window._set_window_banner_text(self._get_agent_address(), name)
+	if len(identities) > 1:
+	  # Check if an identity with server category is present
+	  for i, _identity in enumerate(identities):
+	    if _identity['category'] == 'server' and 'name' in _identity:
+	      name = _identity['name']
+	      break
+	elif 'name' in identities[0]:
+	  name = identities[0]['name']
+
+	if name:
+	  self.window._set_window_banner_text(self._get_agent_address(), name)
 
         # Add an icon to the banner.
         pix = self.cache.get_icon(identities, addr=self._get_agent_address())