diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index dddef30..ac10520 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -23,7 +23,6 @@
   "Face for the supposedly empty line in commit messages."
   :group 'local)
 
-(eval-after-load "eldoc" '(diminish 'eldoc-mode))
 (eval-after-load "em-term" '(add-to-list 'eshell-visual-commands "unison"))
 (eval-after-load "emms-source-file" '(oni:emms-init))
 (eval-after-load "flymake" '(oni:flymake-init))
diff --git a/.emacs.d/init.org b/.emacs.d/init.org
index ac7f7c1..d46e722 100644
--- a/.emacs.d/init.org
+++ b/.emacs.d/init.org
@@ -74,3 +74,11 @@
   #+BEGIN_SRC emacs-lisp :tangle init2.el
     (defalias 'dabbrev-expand 'hippie-expand)
   #+END_SRC
+
+  Don't show it when ~eldoc~ is running, I almost assume that it is
+  whenever I'm working in a mode that supports it anyway. This should
+  only execute once ~eldoc~ has been loaded.
+
+  #+BEGIN_SRC emacs-lisp :tangle init2.el
+    (eval-after-load "eldoc" '(diminish 'eldoc-mode))
+  #+END_SRC