diff --git a/.config/emacs/config.el b/.config/emacs/config.el
index ac88b1b..359cf2f 100644
--- a/.config/emacs/config.el
+++ b/.config/emacs/config.el
@@ -569,14 +569,14 @@
 
 (eval-after-load 'org-indent '(diminish 'org-indent-mode))
 
-  (custom-set-faces
-   '(org-level-1 ((t (:inherit outline-1 :height 1.7))))
-   '(org-level-2 ((t (:inherit outline-2 :height 1.6))))
-   '(org-level-3 ((t (:inherit outline-3 :height 1.5))))
-   '(org-level-4 ((t (:inherit outline-4 :height 1.4))))
-   '(org-level-5 ((t (:inherit outline-5 :height 1.3))))
-   '(org-level-6 ((t (:inherit outline-5 :height 1.2))))
-   '(org-level-7 ((t (:inherit outline-5 :height 1.1)))))
+(custom-set-faces
+ '(org-level-1 ((t (:inherit outline-1 :height 1.7))))
+ '(org-level-2 ((t (:inherit outline-2 :height 1.6))))
+ '(org-level-3 ((t (:inherit outline-3 :height 1.5))))
+ '(org-level-4 ((t (:inherit outline-4 :height 1.4))))
+ '(org-level-5 ((t (:inherit outline-5 :height 1.3))))
+ '(org-level-6 ((t (:inherit outline-5 :height 1.2))))
+ '(org-level-7 ((t (:inherit outline-5 :height 1.1)))))
 
 (require 'org-tempo)
 
@@ -656,10 +656,14 @@
 (setq use-dialog-box nil)    ;; No dialog box
 (setq pop-up-windows nil)    ;; No popup windows
 
+;; The eshell prompt
 (setopt eshell-prompt-function 'fancy-shell)
 (setopt eshell-prompt-regexp "^[^#$\n]* [$#] ")
 (setopt eshell-highlight-prompt nil)
 
+;; Disabling company mode in eshell, because it's annoying.
+(setq company-global-modes '(not eshell-mode))
+
 (use-package eshell-toggle
   :custom
   (eshell-toggle-size-fraction 3)
diff --git a/.config/emacs/config.org b/.config/emacs/config.org
index cebd61e..d747bf2 100644
--- a/.config/emacs/config.org
+++ b/.config/emacs/config.org
@@ -952,10 +952,14 @@ In my configs, all of my shells (bash, fish, zsh and the ESHELL) require my shel
 Eshell is an Emacs 'shell' that is written in Elisp.
 
 #+begin_src emacs-lisp
+;; The eshell prompt
 (setopt eshell-prompt-function 'fancy-shell)
 (setopt eshell-prompt-regexp "^[^#$\n]* [$#] ")
 (setopt eshell-highlight-prompt nil)
 
+;; Disabling company mode in eshell, because it's annoying.
+(setq company-global-modes '(not eshell-mode))
+
 (use-package eshell-toggle
   :custom
   (eshell-toggle-size-fraction 3)