diff --git a/js/websockets.js b/js/websockets.js
index 819592d..a49d1a4 100644
--- a/js/websockets.js
+++ b/js/websockets.js
@@ -385,6 +385,8 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
     };
 
     $scope.hasUnread = function(buffer) {
+      // if search is set, return every buffer 
+      if($scope.search.$) return true;
       if($scope.onlyUnread) {
         // Always show current buffer in list
         if (models.getActiveBuffer() == buffer) {