diff --git a/client/js/chat.js b/client/js/chat.js
index d36fd82..6f92109 100644
--- a/client/js/chat.js
+++ b/client/js/chat.js
@@ -75,13 +75,15 @@ $(function() {
 				var next = null;
 				$(".window").each(function() {
 					var z = $(this).css("z-index");
+					if (z == "auto") z = 0;
 					if (z > highest) {
 						highest = z;
 						next = $(this);
 					}
 				});
 				if (next != null) {
-					next.addClass("active");
+					$("#channel-" + next.attr("id").replace("window-", "")).addClass("active");
+					next.bringToTop();
 				}
 				return;
 			}
diff --git a/lib/server.js b/lib/server.js
index 013b3a6..1d968e1 100644
--- a/lib/server.js
+++ b/lib/server.js
@@ -382,10 +382,8 @@ function event(event, data) {
 			});
 			break;
 		}
-		
 		var name = data[1].nickname;
 		var chan = channels.findWhere({name: name}) || channels.add({type: "query", name: name});
-		
 		var i = 0;
 		for (var k in data[1]) {
 			if (i++ == 5) break;