diff --git a/core/core-editor.el b/core/core-editor.el
index 427957f55..38a6d77bd 100644
--- a/core/core-editor.el
+++ b/core/core-editor.el
@@ -563,10 +563,7 @@ files, so we replace calls to `pp' with the much faster `prin1'."
 (use-package! ws-butler
   ;; a less intrusive `delete-trailing-whitespaces' on save
   :after-call after-find-file
-  :config
-  (appendq! ws-butler-global-exempt-modes
-            '(special-mode comint-mode term-mode eshell-mode))
-  (ws-butler-global-mode +1))
+  :config (ws-butler-global-mode +1))
 
 (provide 'core-editor)
 ;;; core-editor.el ends here
diff --git a/core/packages.el b/core/packages.el
index 5f4bbeaba..19b43c8a6 100644
--- a/core/packages.el
+++ b/core/packages.el
@@ -30,7 +30,10 @@
   ;; Version 0.6.5 is on ELPA which lacks a fix we need, so we install 0.6.6
   ;; from emacsmirror/undo-tree instead.
   :recipe (:host github :repo "emacsmirror/undo-tree"))
-(package! ws-butler)
+(package! ws-butler
+  ;; Use my fork of ws-butler, which has a few choice improvements and
+  ;; optimizations (the original has been abandoned).
+  :recipe (:host github :repo "hlissner/ws-butler"))
 (package! xclip)
 
 ;; core-projects.el