diff --git a/modules/app/rss/autoload.el b/modules/app/rss/autoload.el
index 13bdd8244..396d56908 100644
--- a/modules/app/rss/autoload.el
+++ b/modules/app/rss/autoload.el
@@ -6,6 +6,14 @@
   (interactive)
   (call-interactively 'elfeed))
 
+;;;###autoload
+(defun +rss/quit ()
+  (interactive)
+  (doom-kill-matching-buffers "^\\*elfeed")
+  (dolist (file +rss-elfeed-files)
+    (when-let (buf (get-file-buffer (expand-file-name file +rss-org-dir)))
+      (kill-buffer buf))))
+
 ;;;###autoload
 (defun +rss|elfeed-wrap ()
   "Enhances an elfeed entry's readability by wrapping it to a width of
diff --git a/modules/app/rss/config.el b/modules/app/rss/config.el
index 79e667b66..16c13266f 100644
--- a/modules/app/rss/config.el
+++ b/modules/app/rss/config.el
@@ -41,6 +41,7 @@
         :n "r"   'elfeed-update
         :n "s"   'elfeed-search-live-filter
         :n "RET" 'elfeed-search-show-entry
+        :n "q"   '+rss/quit
 
         :map elfeed-show-mode-map
         [remap doom/kill-this-buffer] 'elfeed-kill-buffer