diff --git a/home/emacs/init.el b/home/emacs/init.el
index ac17a8bf..adc625e6 100644
--- a/home/emacs/init.el
+++ b/home/emacs/init.el
@@ -240,7 +240,9 @@
   :bind (("C-c d" . darkroom-mode)))
 
 (setq shackle-rules '((compilation-mode :noselect t)
-                      (mu4e-main-mode :same t :inhibit-window-quit t))
+                      ((list mu4e-main-mode mu4e-headers-mode)
+                       :same t :inhibit-window-quit t)
+                      (magit-mode :other t))
       shackle-default-rule '(:select t))
 (use-package shackle
   :ensure t
diff --git a/home/emacs/init.org b/home/emacs/init.org
index 8d2f900a..d86749c8 100644
--- a/home/emacs/init.org
+++ b/home/emacs/init.org
@@ -279,12 +279,14 @@
 
 ** Shackle
 #+begin_src emacs-lisp
-      (setq shackle-rules '((compilation-mode :noselect t)
-                            (mu4e-main-mode :same t :inhibit-window-quit t))
-            shackle-default-rule '(:select t))
-      (use-package shackle
-        :ensure t
-        :config (shackle-mode +1))
+  (setq shackle-rules '((compilation-mode :noselect t)
+                        ((list mu4e-main-mode mu4e-headers-mode)
+                         :same t :inhibit-window-quit t)
+                        (magit-mode :other t))
+        shackle-default-rule '(:select t))
+  (use-package shackle
+    :ensure t
+    :config (shackle-mode +1))
 #+end_src
 
 * Org-mode