diff --git a/js/websockets.js b/js/websockets.js
index 436c701..98e76e2 100644
--- a/js/websockets.js
+++ b/js/websockets.js
@@ -482,6 +482,10 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
 
     $scope.hasUnread = function(buffer) {
       if($scope.onlyUnread) {
+        // Always show current buffer in list
+        if (models.getActiveBuffer() == buffer) {
+            return true;
+        }
         return (parseInt(buffer.unread) || 0) > 0;
       }
       return true;