diff --git a/server/server.js b/server/server.js
index 670f5687..241f8bd9 100755
--- a/server/server.js
+++ b/server/server.js
@@ -428,14 +428,15 @@ io.on('connection', function(socket){
   {
     if(in_list)
     {
-    	try
-    	{
-          io.sockets.emit('chat,'+coll, rndName(guid) + " left");
+        if(contains(lists[coll], guid))
+        {
           console.log(guid + " left list " + coll);
     	  	var index = lists[coll].indexOf(guid);
     	  	lists[coll].splice(index, 1);
     	  	io.sockets.emit(coll+",viewers", lists[coll].length);
-    	}catch(err){}
+          io.sockets.emit('chat,'+coll, rndName(guid) + " left");
+        }
+
     }
   });
 
diff --git a/static/css/style.css b/static/css/style.css
index fa231482..ab5efe2d 100755
--- a/static/css/style.css
+++ b/static/css/style.css
@@ -208,7 +208,7 @@ hide mdi-action-visibility mdi-action-visibility-off
     float: left;
 }
 
-#chat-btn {
+#chat-btn i {
   -webkit-transition:opacity 1s;
   transition:opacity 1s;
 }
diff --git a/static/js/chat.js b/static/js/chat.js
index adb6b018..2f9de2aa 100644
--- a/static/js/chat.js
+++ b/static/js/chat.js
@@ -14,7 +14,7 @@ document.getElementById("chat-btn").addEventListener("click", function(){
     console.log("clicked");
     $("#text-chat-input").focus();
     //$("#chat-btn").css("color", "white");
-    $("#chat-btn").css("opacity", 1);
+    $("#chat-btn i").css("opacity", 1);
     clearInterval(blink_interval);
     blink_interval_exists = false;
 });
@@ -39,8 +39,8 @@ socket.on("chat,"+chan.toLowerCase(), function(data)
 
 function chat_blink()
 {
-  $("#chat-btn").css("opacity", 0.5);
-  setTimeout(function(){$("#chat-btn").css("opacity", 1);}, 1000);
+  $("#chat-btn i").css("opacity", 0.5);
+  setTimeout(function(){$("#chat-btn i").css("opacity", 1);}, 1000);
 }
 
 function hashCode(str) { // java String#hashCode