diff --git a/init.el b/init.el
index 9fc5d8e..f6db660 100644
--- a/init.el
+++ b/init.el
@@ -73,7 +73,7 @@
  c-default-style "bsd"
  )
 
-;; Disable some unnecessary byte-compiler warnings.
+;; Disable some unnecessary byte compilation warnings.
 (setq byte-compile-warnings '(not
                               free-vars
                               unresolved
@@ -81,6 +81,14 @@
                               lexical
                               make-local))
 
+;; Set default buffer grouping in ibuffer
+(setq ibuffer-saved-filter-groups
+      (quote (("default"
+               ("Emacs" (or
+                         (name . "^\\*.*\\*$")
+                         (name . "^magit.*:.*$")))))))
+(add-hook 'ibuffer-mode-hook (lambda () (ibuffer-switch-to-saved-filter-groups "default")))
+
 ;; Temporarily disable file handler checking during startup to save time.
 (defvar temp--file-name-handler-alist file-name-handler-alist)
 (setq file-name-handler-alist nil)