diff --git a/init.el b/init.el
index 53d2b81..7e3a7cb 100644
--- a/init.el
+++ b/init.el
@@ -856,10 +856,11 @@ DOCSTRING is an optional form that is discarded upon expansion."
                     ;; fall through to other groups, so they end up grouped with their project buffers).
                     (group-not "Special"
                                (group-or "Special"
+                                         (mode-match "Eshell" (rx bos "eshell-"))
                                          (mode-match "Magit" (rx bos "magit-"))
                                          (mode-match "Forge" (rx bos "forge-"))
                                          (mode-match "Dired" (rx bos "dired"))
-                                         (mode-match "grep" (rx bos "grep-"))
+                                         (mode-match "Grep" (rx bos "grep-"))
                                          (mode-match "Compilation" (rx bos "compilation-"))
                                          (auto-file)))
                     (group
@@ -878,13 +879,11 @@ DOCSTRING is an optional form that is discarded upon expansion."
                     ;; grouping them by directory (using the parent project keeps,
                     ;; e.g. git worktrees with their parent repos).
                     (auto-parent-project)
+                    (group-or "Files"
+                              (auto-file))
+                    ;; Subgroup collecting special buffers so they are easily distinguished from file buffers.
                     (group-not "Special"
-                               ;; This subgroup collects special buffers so they are
-                               ;; easily distinguished from file buffers.
-                               (group-or "Non-file-backed and neither Dired nor Magit"
-                                         (mode-match "Magit Status" (rx bos "magit-status"))
-                                         (mode-match "Dired" (rx bos "dired-"))
-                                         (auto-file))))
+                               (auto-file)))
                    ;; Group remaining buffers by directory, then major mode.
                    (auto-directory)
                    (auto-mode)))