diff --git a/package.json b/package.json
index ee4bef1f..89843a60 100644
--- a/package.json
+++ b/package.json
@@ -45,7 +45,7 @@
     "grunt-contrib-compress": "^0.13.0",
     "grunt-contrib-concat": "^0.5.1",
     "grunt-contrib-cssmin": "^0.14.0",
-    "grunt-contrib-jshint": "^0.10.0",
+    "grunt-contrib-jshint": "^1.1.0",
     "grunt-contrib-uglify": "^0.4.0",
     "grunt-contrib-watch": "^0.6.1",
     "grunt-coveralls": "^0.3.0",
diff --git a/src/view/pane/chat.js b/src/view/pane/chat.js
index 196ba2f2..36ba0396 100644
--- a/src/view/pane/chat.js
+++ b/src/view/pane/chat.js
@@ -196,10 +196,11 @@ Candy.View.Pane = (function(self, $) {
      *   (Boolean) - false, this will stop the event from bubbling
      */
     allTabsClosed: function() {
+      self.Chat.Toolbar.hide();
+      self.Chat.hideMobileIcon();
+
       if (Candy.Core.getOptions().disconnectWithoutTabs) {
         Candy.Core.disconnect();
-        self.Chat.Toolbar.hide();
-        self.Chat.hideMobileIcon();
         return;
       }
     },
@@ -384,7 +385,7 @@ Candy.View.Pane = (function(self, $) {
        * Hide toolbar.
        */
       hide: function() {
-        $('#chat-toolbar').hide();
+        $('#chat-toolbar').removeAttr('style').hide();
       },
 
       /* Function: update
diff --git a/src/view/pane/roster.js b/src/view/pane/roster.js
index b12aa81b..ae5e6cca 100644
--- a/src/view/pane/roster.js
+++ b/src/view/pane/roster.js
@@ -185,7 +185,7 @@ Candy.View.Pane = (function(self, $) {
       }
       // first user in roster
       if(!userInserted) {
-        rosterPane.append(html);
+        rosterPane.append($html);
       }
     },
 
diff --git a/src/view/pane/window.js b/src/view/pane/window.js
index 00e2e690..b49b0e22 100644
--- a/src/view/pane/window.js
+++ b/src/view/pane/window.js
@@ -70,6 +70,10 @@ Candy.View.Pane = (function(self) {
       }
     },
 
+    getUnreadMessagesCount: function() {
+      return self.Window._unreadMessagesCount;
+    },
+
     /** Function: clearUnreadMessages
      * Clear unread message count in window title.
      */