diff --git a/dotfiles/emacs.d/README.org b/dotfiles/emacs.d/README.org
index 468f6af0..6137f4ea 100644
--- a/dotfiles/emacs.d/README.org
+++ b/dotfiles/emacs.d/README.org
@@ -1806,7 +1806,9 @@ I don't use auto-complete at all, so I have set up a hook to automatically disab
   (progn
     (defun imalison:after-magit-visit-file (&rest args)
       (when (derived-mode-p 'org-mode)
-        (org-show-context 'magit-goto))))
+        (org-show-context 'magit-goto)))
+    (defun imalison:magit-popup-mode-hook ()
+      (setq show-trailing-whitespace nil)))
   :config
   (progn
     (unbind-key "C-j" magit-status-mode-map)
@@ -1821,6 +1823,7 @@ I don't use auto-complete at all, so I have set up a hook to automatically disab
 
     (add-to-list 'org-show-context-detail '(magit-goto . lineage))
     (advice-add 'magit-diff-visit-file :after 'imalison:after-magit-visit-file)
+    (add-hook 'magit-popup-mode-hook 'imalison:magit-popup-mode-hook)
     (use-package magit-filenotify
       ;; Seems like OSX does not support filenotify.
       :disabled t