diff --git a/modules/editing.el b/modules/editing.el
index dfb2081..7c7c408 100644
--- a/modules/editing.el
+++ b/modules/editing.el
@@ -61,9 +61,12 @@
 
   (use-package fill-column-indicator
     :defer t
+    :bind
+    (("C-x t f" . fci-mode))
     :init
-    (add-hook 'prog-mode-hook 'fci-mode-unless-large-file)
-    (add-hook 'text-mode-hook 'fci-mode-unless-large-file))
+    ;; (add-hook 'prog-mode-hook 'fci-mode-unless-large-file)
+    ;; (add-hook 'text-mode-hook 'fci-mode-unless-large-file)
+    )
 
   ;; --------------------------------------------------------------------------
   ;; Rainbow mode.
diff --git a/modules/programming.el b/modules/programming.el
index 961229a..6e0e744 100644
--- a/modules/programming.el
+++ b/modules/programming.el
@@ -186,13 +186,12 @@
   ;; --------------------------------------------------------------------------
 
   ;; The following setting of `show-trailing-whitespace' is incompatible with
-  ;; fci-mode.  The only known workaround is to have whitespace mode on with
-  ;; whitespace-style set such that only trailing whitespace is shown.  At the
-  ;; moment, just rely on `ws-butler'.
+  ;; `fci-mode'.  The only known workaround is to have whitespace mode on with
+  ;; whitespace-style set such that only trailing whitespace is shown.
 
-  ;; (add-hook 'prog-mode-hook (lambda ()
-  ;;                             (interactive)
-  ;;                             (setq show-trailing-whitespace t)))
+  (add-hook 'prog-mode-hook (lambda ()
+                              (interactive)
+                              (setq show-trailing-whitespace t)))
 
   ;; --------------------------------------------------------------------------
   ;; Automatically indent yanked text in programming mode.