diff --git a/core/defuns/defuns-buffers.el b/core/defuns/defuns-buffers.el
index b6a4bfee4..ad9bace3d 100644
--- a/core/defuns/defuns-buffers.el
+++ b/core/defuns/defuns-buffers.el
@@ -41,7 +41,8 @@ Inspired from http://demonastery.org/2013/04/emacs-evil-narrow-region/"
 
     If PROJECT-P is non-nil, get all buffers in current workgroup
     If both are non-nil, get all project buffers across all workgroups"
-  (let ((buffers (buffer-list))
+  (let* ((assocbuf (wg-workgroup-associated-buffers nil))
+         (buffers (--filter (memq it assocbuf) (buffer-list)))
         project-root)
     (if (and project-p (setq project-root (narf/project-root t)))
         (funcall (if (eq project-p 'not) '-remove '-filter)