diff --git a/chat.js b/chat.js
index afb06c771..8db249b7e 100644
--- a/chat.js
+++ b/chat.js
@@ -204,8 +204,10 @@ var Chat = (function (my) {
                                             duration: 500});
         }
         else {
-            // Undock the toolbar when the chat is shown.
-            Toolbar.dockToolbar(false);
+            // Undock the toolbar when the chat is shown and if we're in a 
+            // video mode.
+            if (VideoLayout.isLargeVideoVisible())
+                Toolbar.dockToolbar(false);
 
             videospace.animate({right: chatSize[0],
                                 width: videospaceWidth,