diff --git a/js/glowingbear.js b/js/glowingbear.js
index 3a2ab93..7b00eb6 100644
--- a/js/glowingbear.js
+++ b/js/glowingbear.js
@@ -738,7 +738,11 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
             if (buffer.notification > 0) {
                 $scope.setActiveBuffer(buffer.id);
                 break;
-            } else if(buffer.unread > 0) {
+            }
+        }
+        for (var i in sortedBuffers) {
+            var buffer = sortedBuffers[i];
+            if(buffer.unread > 0) {
                 $scope.setActiveBuffer(buffer.id);
                 break;
             }