diff --git a/index.html b/index.html
index c9a0301..578651b 100644
--- a/index.html
+++ b/index.html
@@ -100,7 +100,8 @@ $ openssl req -nodes -newkey rsa:2048 -keyout relay.pem -x509 -days 365 -out rel
           </li>
           <li class="label" ng-class="{'active': content.active }" ng-repeat="(key, content) in buffers | toArray | filter:search | filter:hasUnread | orderBy:'content.number':true">
             <a href="#" ng-click="setActiveBuffer(content.id)" title="{{ content.fullName }}">
-              <span class="badge pull-right" ng-class="{'danger': content.notification }" ng-bind="content.unread"></span>
+              <span class="badge pull-right" ng-hide="content.notification" ng-bind="content.unread"></span>
+              <span class="badge pull-right danger" ng-show="content.notification" ng-bind="content.notification"></span>
               {{ content.shortName }}<span ng-hide="content.shortName">{{ content.fullName }}</span>
             </a>
           </li>
diff --git a/js/models.js b/js/models.js
index a505b81..bbac9e6 100644
--- a/js/models.js
+++ b/js/models.js
@@ -17,7 +17,7 @@ models.service('models', ['$rootScope', 'colors', function($rootScope, colors) {
         var pointer = message['pointers'][0]
         var lines = []
         var active = false;
-        var notification = false;
+        var notification = '';
         var unread = '';
         var lastSeen = -2;
 
@@ -161,9 +161,9 @@ models.service('models', ['$rootScope', 'colors', function($rootScope, colors) {
             }
         });
 
-        activeBuffer.notification = false;
         activeBuffer.active = true;
         activeBuffer.unread = '';
+        activeBuffer.notification = '';
 
         $rootScope.$emit('activeBufferChanged');
     }
diff --git a/js/websockets.js b/js/websockets.js
index 70965de..ec10555 100644
--- a/js/websockets.js
+++ b/js/websockets.js
@@ -209,7 +209,11 @@ weechat.factory('handlers', ['$rootScope', 'colors', 'models', 'plugins', functi
 
                 if(message.highlight || _.contains(message.tags, 'notify_private') ) {
                     $rootScope.createHighlight(buffer, message);
-                    buffer.notification = true;
+                    if (buffer.notification == '' || buffer.notification == undefined) {
+                        buffer.notification = 1;
+                    }else {
+                        buffer.notification++;
+                    }
                 }
             }
         }
@@ -519,7 +523,7 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
         // Find next buffer with activity and switch to it
         for(i in $scope.buffers) {
             var buffer = $scope.buffers[i];
-            if(buffer.notification) {
+            if((parseInt(buffer.notification) || 0) > 0) {
                 $scope.setActiveBuffer(buffer.id);
                 break;
             }else if((parseInt(buffer.unread) || 0) > 0) {