diff --git a/config/org-mode.org b/config/org-mode.org
index 21c5e53..02a8a11 100644
--- a/config/org-mode.org
+++ b/config/org-mode.org
@@ -30,12 +30,6 @@ For reference information, see [[https://orgmode.com][Org-mode website]]
         org-refile-targets '((nil . (:maxlevel . 2))
                              (org-agenda-files . (:maxlevel . 2))))
 
-  ;; Visually indent org-mode files to a given header level
-  (add-hook 'org-mode-hook #'org-indent-mode)
-
-  ;; Enable auto-fill in org-mode buffers
-  (add-hook 'org-mode-hook #'turn-on-auto-fill)
-
   (use-package org
     :ensure t
     :custom
@@ -49,10 +43,18 @@ For reference information, see [[https://orgmode.com][Org-mode website]]
                                 (lua . t)
                                 (python . t)))
     :config
+    ;; Ensure tables and src blocks use fixed-pitch font
     (set-face-attribute 'org-table nil :inherit 'fixed-pitch)
     (set-face-attribute 'org-block nil :inherit 'fixed-pitch)
+    ;; Let quote and verse blocks use variable-pitch font, if configured
     (set-face-attribute 'org-quote nil :inherit 'variable-pitch)
-    (set-face-attribute 'org-verse nil :inherit 'variable-pitch))
+    (set-face-attribute 'org-verse nil :inherit 'variable-pitch)
+    ;; Visually indent org-mode files to a given header level
+    (add-hook 'org-mode-hook #'(lambda () (org-indent-mode +1)))
+    ;; Enable auto-fill in org-mode buffers
+    (add-hook 'org-mode-hook #'turn-on-auto-fill)
+    ;; Freeze org-table header row when scrolling past
+    (add-hook 'org-mode-hook #'(lambda () (org-table-header-line-mode +1))))
 #+end_src
 
 * Keymaps