diff --git a/core/core-editor.el b/core/core-editor.el
index 7bb9703a1..6929f56b1 100644
--- a/core/core-editor.el
+++ b/core/core-editor.el
@@ -95,16 +95,6 @@
   (add-hook! 'editorconfig-custom-hooks
     (if indent-tabs-mode (whitespace-mode +1))))
 
-;; Ediff
-(setq ediff-diff-options           "-w"
-      ediff-split-window-function 'split-window-horizontally
-      ;; no extra frames
-      ediff-window-setup-function 'ediff-setup-windows-plain)
-
-(defvar doom-ediff-enabled nil)
-(add-hook! ediff-startup (setq doom-ediff-enabled t))
-(add-hook! ediff-quit    (setq doom-ediff-enabled nil))
-
 
 ;;
 ;; Hooks 'n hacks
diff --git a/core/core-vcs.el b/core/core-vcs.el
index 8768d18ab..240bd88be 100644
--- a/core/core-vcs.el
+++ b/core/core-vcs.el
@@ -82,5 +82,21 @@
 (use-package browse-at-remote
   :commands (browse-at-remote/browse browse-at-remote/get-url))
 
+;; Ediff
+(defvar doom-ediff-enabled nil)
+(add-hook! ediff-load
+  (setq ediff-diff-options           "-w"
+        ediff-split-window-function 'split-window-horizontally
+        ediff-window-setup-function 'ediff-setup-windows-plain) ; no extra frames
+
+  ;; Brighten other buffers
+  (add-hook 'ediff-prepare-buffer-hook 'doom-buffer-mode)
+
+  ;; TODO Custom modeline for ediff buffers
+
+  ;; For modeline awareness
+  (add-hook! ediff-startup (setq doom-ediff-enabled t))
+  (add-hook! ediff-quit    (setq doom-ediff-enabled nil)))
+
 (provide 'core-vcs)
 ;;; core-vcs.el ends here