diff --git a/chat.js b/chat.js
index b7255a346..d85bd7752 100644
--- a/chat.js
+++ b/chat.js
@@ -135,8 +135,7 @@ var Chat = (function (my) {
         {
             $("#subject").css({display: "block"});
         }
-    }
-
+    };
 
     /**
      * Opens / closes the chat area.
@@ -187,6 +186,9 @@ var Chat = (function (my) {
                                             duration: 500});
         }
         else {
+            // Undock the toolbar when the chat is shown.
+            Toolbar.dockToolbar(false);
+
             videospace.animate({right: chatSize[0],
                                 width: videospaceWidth,
                                 height: videospaceHeight},
@@ -290,7 +292,7 @@ var Chat = (function (my) {
         if (unreadMessages) {
             unreadMsgElement.innerHTML = unreadMessages.toString();
 
-            Toolbar.showToolbar();
+            Toolbar.dockToolbar(true);
 
             var chatButtonElement
                 = document.getElementById('chatButton').parentNode;
diff --git a/css/main.css b/css/main.css
index eb9cc650d..e0a1726e9 100644
--- a/css/main.css
+++ b/css/main.css
@@ -131,15 +131,24 @@ html, body{
 }
 
 #chatButton {
-    -webkit-transition: all .5s ease-in-out;;
-       -moz-transition: all .5s ease-in-out;;
-            transition: all .5s ease-in-out;;
+    -webkit-transition: all .5s ease-in-out;
+       -moz-transition: all .5s ease-in-out;
+            transition: all .5s ease-in-out;
 }
-
+/*#ffde00*/
 #chatButton.active {
-    -webkit-text-shadow: 0 0 10px #ffffff;
-    -moz-text-shadow: 0 0 10px #ffffff;
-    text-shadow: 0 0 10px #ffffff;
+    -webkit-text-shadow:    -1px 0 10px #00ccff,
+                            0 1px 10px #00ccff,
+                            1px 0 10px #00ccff,
+                            0 -1px 10px #00ccff;
+    -moz-text-shadow:   1px 0 10px #00ccff,
+                        0 1px 10px #00ccff,
+                        1px 0 10px #00ccff,
+                        0 -1px 10px #00ccff;
+    text-shadow:    -1px 0 10px #00ccff,
+                    0 1px 10px #00ccff,
+                    1px 0 10px #00ccff,
+                    0 -1px 10px #00ccff;
 }
 
 a.button:hover {
diff --git a/toolbar.js b/toolbar.js
index 116b55adb..cdaaef239 100644
--- a/toolbar.js
+++ b/toolbar.js
@@ -236,9 +236,12 @@ var Toolbar = (function (my) {
             if (!$('#header').is(':visible')) {
                 Toolbar.showToolbar();
             }
+
             // Then clear the time out, to dock the toolbar.
-            clearTimeout(toolbarTimeout);
-            toolbarTimeout = null;
+            if (toolbarTimeout) {
+                clearTimeout(toolbarTimeout);
+                toolbarTimeout = null;
+            }
         }
         else {
             if (!$('#header').is(':visible')) {