diff --git a/tekka/GUI.py b/tekka/GUI.py
index 7f240d7..18f8621 100644
--- a/tekka/GUI.py
+++ b/tekka/GUI.py
@@ -385,7 +385,7 @@ class tekkaServerTree(tekkaList, gtk.TreeView):
 
 		return iter
 
-	def addChannel(self, servername, channelname, nicks=None, topic=None, topicsetter=None):
+	def addChannel(self, servername, channelname, nicks=None, topic=None, topicsetter=None, is_channel=True):
 		store = self.get_model()
 
 		row = self.findRow(servername)
@@ -400,7 +400,7 @@ class tekkaServerTree(tekkaList, gtk.TreeView):
 
 		buffer = htmlbuffer.htmlbuffer()
 		buffer.setUrlHandler(self.urlHandler)
-		obj = channel.tekkaChannel(channelname, buffer)
+		obj = channel.tekkaChannel(channelname, buffer, is_channel=is_channel)
 		if nicks:
 			obj.getNickList().addNicks(nicks)
 		if topic:
diff --git a/tekka/channel.py b/tekka/channel.py
index 6718e7e..2f762b3 100644
--- a/tekka/channel.py
+++ b/tekka/channel.py
@@ -113,12 +113,13 @@ class tekkaServer(tekkaTab):
 		return base
 
 class tekkaChannel(tekkaTab):
-	def __init__(self, name, buffer=None, nicklist=None, topic=None, topicsetter=None):
+	def __init__(self, name, buffer=None, nicklist=None, topic=None, topicsetter=None, is_channel=True):
 		tekkaTab.__init__(self, name, buffer)
 
 		self.nicklist = nicklist or GUI.tekkaNickListStore()
 		self.topic = topic or ""
 		self.topicsetter = topicsetter or ""
+		self.is_channel = is_channel
 
 		self.joined = False
 
@@ -157,7 +158,7 @@ class tekkaChannel(tekkaTab):
 
 		base = self.name
 
-		if not self.joined:
+		if not self.joined and self.is_channel:
 			base = "("+base+")"
 
 		if "action" in self.newMessage:
diff --git a/tekka/commands.py b/tekka/commands.py
index 9b71437..8e30dbf 100644
--- a/tekka/commands.py
+++ b/tekka/commands.py
@@ -360,7 +360,7 @@ class tekkaCommands(object):
 			return
 
 		if not self.gui.getServerTree().getChannel(server,xargs[0],sens=False):
-			ret,iter = self.gui.getServerTree().addChannel(server, xargs[0])
+			ret,iter = self.gui.getServerTree().addChannel(server, xargs[0], is_channel=False)
 
 			# print history
 			servertree = self.gui.getServerTree()
diff --git a/tekka/main.py b/tekka/main.py
index b93ec47..3aa6c22 100755
--- a/tekka/main.py
+++ b/tekka/main.py
@@ -520,7 +520,7 @@ class tekkaMain(object):
 		if not server:
 			return
 		nick = treeview.get_model()[path][GUI.tekkaNickListStore.COLUMN_NICK]
-		iter = serverTree.addChannel(server, nick)[1]
+		iter = serverTree.addChannel(server, nick, is_channel=False)[1]
 
 		path = serverTree.get_model().get_path(iter)
 		self.gui.switchTreeTab(path)
diff --git a/tekka/signals.py b/tekka/signals.py
index b2bc9f8..d405d7a 100644
--- a/tekka/signals.py
+++ b/tekka/signals.py
@@ -114,7 +114,7 @@ class tekkaSignals(object):
 			topic = self.sushi.channel_topic(server, channel)
 			serverTree = self.gui.getServerTree()
 
-			ret,iter = serverTree.addChannel(server, channel, nicks, topic)
+			ret,iter = serverTree.addChannel(server, channel, nicks, topic, is_channel=(channel[0] in self.sushi.support_chantypes(server)))
 
 			obj = serverTree.getObject(server,channel)
 			nicklist = obj.getNickList()
@@ -185,7 +185,7 @@ class tekkaSignals(object):
 		if channel and channel != nick:
 			servertree.renameChannel(server, channel, nick)
 		elif not channel:
-			servertree.addChannel(server,nick)
+			servertree.addChannel(server,nick, is_channel=(nick[0] in self.sushi.support_chantypes(server)))
 			self.lastLog(server, nick)
 
 	"""